* Handle bugs assigned to multiple packages correctly

[debbugs.git] / Debbugs / Status.pm

diff --git a/Debbugs/Status.pm b/Debbugs/Status.pm
index d8a1f05ac2a6f14b626b6635993111b5be1ee09f..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;
               }
          }
 
@@ -1085,7 +1089,7 @@ sub buggy {
          $version = Debbugs::Versions->new(\&Debbugs::Versions::Dpkg::vercmp);
          foreach my $source (keys %sources) {
               my $srchash = substr $source, 0, 1;
-              my $version_fh = new IO::File "$config{version_packages_dir}/$srchash/$source", 'r' or
+              my $version_fh = IO::File->new("$config{version_packages_dir}/$srchash/$source", 'r') or
                    warn "Unable to open $config{version_packages_dir}/$srchash/$source: $!" and next;
               $version->load($version_fh);
          }
@@ -1101,7 +1105,8 @@ sub buggy {
 
 sub isstrongseverity {
     my $severity = shift;
-    $severity = $config{default_severity} if $severity eq '';
+    $severity = $config{default_severity} if
+        not defined $severity or $severity eq '';
     return grep { $_ eq $severity } @{$config{strong_severities}};
 }
 
@@ -1115,43 +1120,50 @@ sub update_realtime {
 
        # update realtime index.db
 
-       open(IDXDB, "<$file") or die "Couldn't open $file";
-       open(IDXNEW, ">$file.new");
+       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')
+            or die "Couldn't open ${file}.new: $!";
 
        my $min_bug = min(keys %bugs);
        my $line;
        my @line;
        my %changed_bugs;
-       while($line = <IDXDB>) {
+       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]};
                  delete $bugs{$line[1]};
                  $min_bug = min(keys %bugs);
                  if ($new eq "NOCHANGE") {
-                      print IDXNEW $line;
+                      print {$idx_new} $line;
                       $changed_bugs{$line[1]} = $line;
                  } elsif ($new eq "REMOVE") {
                       $changed_bugs{$line[1]} = $line;
                  } else {
-                      print IDXNEW $new;
+                      print {$idx_new} $new;
                       $changed_bugs{$line[1]} = $line;
                  }
             }
-            elsif ($line[1] > $min_bug) {
-                 print IDXNEW $bugs{$min_bug};
-                 delete $bugs{$min_bug};
-                 $min_bug = min(keys %bugs);
-                 $changed_bugs{$line[1]} = '';
+            else {
+                 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;
 
-       print IDXNEW while(<IDXDB>);
+       print {$idx_new} <$idx_old>;
 
-       close(IDXNEW);
-       close(IDXDB);
+       close($idx_new);
+       close($idx_old);
 
        rename("$file.new", $file);