From e65d72f5f2364a4e9fd1e9e6652c5d75e0cc6cd5 Mon Sep 17 00:00:00 2001
From: Michael Schroeder <mls@suse.de>
Date: Thu, 1 Mar 2012 12:54:59 +0100
Subject: [PATCH] [backend] fix aggregation, it should check for the existance
 the the complete filename instead of just the binary name.

---
 src/backend/bs_sched | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/backend/bs_sched b/src/backend/bs_sched
index 589bdfe5e12..8461fb11126 100755
--- a/src/backend/bs_sched
+++ b/src/backend/bs_sched
@@ -3651,7 +3651,6 @@ sub rebuildpatchinfo {
   unlink "$jobdatadir/$_" for ls($jobdatadir);
   mkdir_p($jobdatadir);
   my $jobrepo = {};
-  my %jobbins;
   my $error;
   my %donebins;
   my @upackages;
@@ -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;