* Handle bugs assigned to multiple packages correctly

[debbugs.git] / Debbugs / Status.pm

diff --git a/Debbugs/Status.pm b/Debbugs/Status.pm
index 0a65533b8413e483343483185ecf100fe923a52f..6911c32a273193fc145b06f0ce5ac1a2e671e9f7 100644 (file)
--- a/Debbugs/Status.pm
+++ b/Debbugs/Status.pm
@@ -908,23 +908,27 @@ sub bug_presence {
          my %sourceversions;
          if (defined $param{version}) {
               foreach my $arch (make_list($param{arch})) {
-                   my @temp = makesourceversions($status{package},
-                                                 $arch,
-                                                 make_list($param{version})
-                                                );
-                   @sourceversions{@temp} = (1) x @temp;
+                   for my $package (split /\s*,\s*/, $status{package}) {
+                        my @temp = makesourceversions($package,
+                                                      $arch,
+                                                      make_list($param{version})
+                                                     );
+                        @sourceversions{@temp} = (1) x @temp;
+                   }
               }
          } elsif (defined $param{dist}) {
               foreach my $arch (make_list($param{arch})) {
                    my @versions;
-                   foreach my $dist (make_list($param{dist})) {
-                        push @versions, getversions($status{package}, $dist, $arch);
+                   for my $package (split /\s*,\s*/, $status{package}) {
+                        foreach my $dist (make_list($param{dist})) {
+                             push @versions, getversions($package, $dist, $arch);
+                        }
+                        my @temp = makesourceversions($package,
+                                                      $arch,
+                                                      @versions
+                                                     );
+                        @sourceversions{@temp} = (1) x @temp;
                    }
-                   my @temp = makesourceversions($status{package},
-                                                 $arch,
-                                                 @versions
-                                                );
-                   @sourceversions{@temp} = (1) x @temp;
               }
          }
 
@@ -1116,6 +1120,7 @@ sub update_realtime {
 
        # update realtime index.db
 
+       return () unless keys %bugs;
        my $idx_old = IO::File->new($file,'r')
             or die "Couldn't open ${file}: $!";
        my $idx_new = IO::File->new($file.'.new','w')
@@ -1127,7 +1132,6 @@ sub update_realtime {
        my %changed_bugs;
        while($line = <$idx_old>) {
             @line = split /\s/, $line;
-            last unless (keys %bugs) > 0;
             # Two cases; replacing existing line or adding new line
             if (exists $bugs{$line[1]}) {
                  my $new = $bugs{$line[1]};
@@ -1147,10 +1151,12 @@ sub update_realtime {
                  while ($line[1] > $min_bug) {
                       print {$idx_new} $bugs{$min_bug};
                       delete $bugs{$min_bug};
+                      last unless keys %bugs;
                       $min_bug = min(keys %bugs);
                  }
                  print {$idx_new} $line;
             }
+            last unless keys %bugs;
        }
        print {$idx_new} map {$bugs{$_}} sort keys %bugs;