Skip to content

Commit

Permalink
Merge pull request #14014 from mlschroe/master
Browse files Browse the repository at this point in the history
[backend] add complete filename to deps of kiwi product build jobs
  • Loading branch information
mlschroe committed Mar 15, 2023
2 parents 712bf2c + 213642b commit 8508d8a
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/backend/BSSched/BuildJob/KiwiProduct.pm
Original file line number Diff line number Diff line change
Expand Up @@ -562,7 +562,6 @@ sub build {
my @bdeps;
for my $rpm (BSUtil::unify(@{$rpms || []})) {
my @b = split('/', $rpm);
next if @b == 1;
next unless @b == 5;
my $b;
if ($b[4] =~ /^(?:::import::.*::)?(.+)-([^-]+)-([^-]+)\.([a-zA-Z][^\.\-]*)\.rpm$/) {
Expand All @@ -575,21 +574,22 @@ sub build {
'repository' => $b[1],
'repoarch' => $b[2],
'package' => $b[3],
'binary' => $b[4],
};
} elsif ($dobuildinfo && (($b[4] =~ /^(.*)[-.]appdata\.xml$/) || $b[4] eq '_modulemd.yaml')) {
$b = {
'project' => $b[0],
'repository' => $b[1],
'repoarch' => $b[2],
'package' => $b[3],
'binary' => $b[4],
};
} else {
next;
}
if ($dobuildinfo) {
$b->{'hdrmd5'} = $rpms_hdrmd5->{$rpm} if $rpms_hdrmd5->{$rpm};
$b->{'noinstall'} = 1;
$b->{'binary'} = $b[4];
delete $b->{'repoarch'} if $b->{'repoarch'} eq $myarch;
}
push @bdeps, $b;
Expand Down
Binary file modified src/backend/t/data/0160/result/tc01.xz
Binary file not shown.

0 comments on commit 8508d8a

Please sign in to comment.