[opensuse-buildservice] [PATCH] [BACKEND] fix aggregating of multiarch packages

Aggregating a patchinfo does not work, as aggregate only copies a binary of particular name only once. patchinfos however contain usually binaries of multiple architectures, which means previously only one of the archs was aggregated, the others were skipped. --- src/backend/bs_sched | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/backend/bs_sched b/src/backend/bs_sched index 0875cf9..ac97006 100755 --- a/src/backend/bs_sched +++ b/src/backend/bs_sched @@ -4101,12 +4101,13 @@ sub rebuildaggregate { my $copysources; for my $abin (sort keys %$ajobrepo) { my $r = $ajobrepo->{$abin}; + my $binname = $r->{'name'} . "." . $r->{'arch'}; next unless $r->{'source'}; next if $abinfilter && !$abinfilter->{$r->{'name'}}; - next if $jobbins{$r->{'name'}}; + next if $jobbins{$binname}; # FIXME: How is debian handling debug packages ? next if $nosource && ($r->{'name'} =~ /-debug(:?info|source)?$/); - $jobbins{$r->{'name'}} = 1; + $jobbins{$binname} = 1; my $basename = $abin; $basename =~ s/.*\///; $basename =~ s/^upload:// if $cpio; -- 1.7.8 -- To unsubscribe, e-mail: opensuse-buildservice+unsubscribe@opensuse.org To contact the owner, e-mail: opensuse-buildservice+owner@opensuse.org
participants (1)
-
Dirk Müller