Skip to content

Commit

Permalink
[backend] fix aggregation, it should check for the existance the the …
Browse files Browse the repository at this point in the history
…complete filename instead of just the binary name.
  • Loading branch information
mlschroe committed Mar 1, 2012
1 parent bf36364 commit e65d72f
Showing 1 changed file with 4 additions and 5 deletions.
9 changes: 4 additions & 5 deletions src/backend/bs_sched
Original file line number Diff line number Diff line change
Expand Up @@ -3651,7 +3651,6 @@ sub rebuildpatchinfo {
unlink "$jobdatadir/$_" for ls($jobdatadir);
mkdir_p($jobdatadir);
my $jobrepo = {};
my %jobbins;
my $error;
my %donebins;
my @upackages;
Expand Down Expand Up @@ -4104,13 +4103,13 @@ sub rebuildaggregate {
my $r = $ajobrepo->{$abin};
next unless $r->{'source'};
next if $abinfilter && !$abinfilter->{$r->{'name'}};
next if $jobbins{$r->{'name'}};
# FIXME: How is debian handling debug packages ?
next if $nosource && ($r->{'name'} =~ /-debug(:?info|source)?$/);
$jobbins{$r->{'name'}} = 1;
# FIXME: How is debian handling debug packages ?
next if $nosource && ($r->{'name'} =~ /-debug(:?info|source)?$/);
my $basename = $abin;
$basename =~ s/.*\///;
$basename =~ s/^upload:// if $cpio;
next if $jobbins{$basename}; # first one wins
$jobbins{$basename} = 1;
BSUtil::cp($abin, "$jobdatadir/$basename");
$jobrepo->{"$jobdatadir/$basename"} = $r;
$copysources = 1 unless $nosource;
Expand Down

0 comments on commit e65d72f

Please sign in to comment.