]> git.donarmstrong.com Git - debbugs.git/blobdiff - Debbugs/Status.pm
* Handle bugs assigned to multiple packages correctly
[debbugs.git] / Debbugs / Status.pm
index 5fb5413dcdb3fb1a1e3323ec29a9b45d77da6a4c..6911c32a273193fc145b06f0ce5ac1a2e671e9f7 100644 (file)
@@ -159,17 +159,24 @@ sub read_bug{
     die "One of bug or summary must be passed to read_bug"
         if not exists $param{bug} and not exists $param{summary};
     my $status;
+    my $log;
+    my $location;
     if (not defined $param{summary}) {
-        my ($lref, $location) = @param{qw(bug location)};
+        my $lref;
+        ($lref,$location) = @param{qw(bug location)};
         if (not defined $location) {
              $location = getbuglocation($lref,'summary');
              return undef if not defined $location;
         }
         $status = getbugcomponent($lref, 'summary', $location);
+        $log    = getbugcomponent($lref, 'log'    , $location);
         return undef unless defined $status;
     }
     else {
         $status = $param{summary};
+        $log = $status;
+        $log =~ s/\.summary$/.log/;
+        ($location) = $status =~ m/(db-h|db|archive)/;
     }
     my $status_fh = new IO::File $status, 'r' or
         warn "Unable to open $status for reading: $!" and return undef;
@@ -216,6 +223,9 @@ sub read_bug{
            $data{$field} = decode_rfc1522($data{$field});
        }
     }
+    # Add log last modified time
+    $data{log_modified} = (stat($log))[9];
+    $data{location} = $location;
 
     return \%data;
 }
@@ -898,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;
               }
          }
 
@@ -1075,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);
          }
@@ -1091,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}};
 }
 
@@ -1101,77 +1116,95 @@ sub isstrongseverity {
 =cut
 
 sub update_realtime {
-       my ($file, $bug, $new) = @_;
+       my ($file, %bugs) = @_;
 
        # 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;
-       while($line = <IDXDB>) {
-               @line = split /\s/, $line;
-               last if ($line[1] >= $bug);
-               print IDXNEW $line;
-               $line = "";
-       }
-
-       if ($new eq "NOCHANGE") {
-               print IDXNEW $line if ($line ne ""  and $line[1] == $bug);
-       } elsif ($new eq "REMOVE") {
-               0;
-       } else {
-               print IDXNEW $new;
-       }
-       if (defined $line and $line ne "" and  @line and $line[1] > $bug) {
-               print IDXNEW $line;
-               $line = "";
+       my %changed_bugs;
+       while($line = <$idx_old>) {
+            @line = split /\s/, $line;
+            # 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 {$idx_new} $line;
+                      $changed_bugs{$line[1]} = $line;
+                 } elsif ($new eq "REMOVE") {
+                      $changed_bugs{$line[1]} = $line;
+                 } else {
+                      print {$idx_new} $new;
+                      $changed_bugs{$line[1]} = $line;
+                 }
+            }
+            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);
 
-       return $line;
+       return %changed_bugs;
 }
 
 sub bughook_archive {
-       my $ref = shift;
+       my @refs = @_;
        &filelock("debbugs.trace.lock");
-       &appendfile("debbugs.trace","archive $ref\n");
-       my $line = update_realtime(
-               "$config{spool_dir}/index.db.realtime", 
-               $ref,
-               "REMOVE");
+       &appendfile("debbugs.trace","archive ".join(',',@refs)."\n");
+       my %bugs = update_realtime("$config{spool_dir}/index.db.realtime",
+                                  map{($_,'REMOVE')} @refs);
        update_realtime("$config{spool_dir}/index.archive.realtime",
-               $ref, $line);
+                       %bugs);
        &unfilelock;
 }
 
 sub bughook {
-       my ( $type, $ref, $data ) = @_;
+       my ( $type, %bugs_temp ) = @_;
        &filelock("debbugs.trace.lock");
 
-       &appendfile("debbugs.trace","$type $ref\n",makestatus($data, 1));
-
-       my $whendone = "open";
-       my $severity = $config{default_severity};
-       (my $pkglist = $data->{package}) =~ s/[,\s]+/,/g;
-       $pkglist =~ s/^,+//;
-       $pkglist =~ s/,+$//;
-       $whendone = "forwarded" if defined $data->{forwarded} and length $data->{forwarded};
-       $whendone = "done" if defined $data->{done} and length $data->{done};
-       $severity = $data->{severity} if length $data->{severity};
-
-       my $k = sprintf "%s %d %d %s [%s] %s %s\n",
-                       $pkglist, $ref, $data->{date}, $whendone,
-                       $data->{originator}, $severity, $data->{keywords};
-
-       update_realtime("$config{spool_dir}/index.db.realtime", $ref, $k);
+       my %bugs;
+       for my $bug (keys %bugs_temp) {
+            my $data = $bugs_temp{$bug};
+            &appendfile("debbugs.trace","$type $bug\n",makestatus($data, 1));
+
+            my $whendone = "open";
+            my $severity = $config{default_severity};
+            (my $pkglist = $data->{package}) =~ s/[,\s]+/,/g;
+            $pkglist =~ s/^,+//;
+            $pkglist =~ s/,+$//;
+            $whendone = "forwarded" if defined $data->{forwarded} and length $data->{forwarded};
+            $whendone = "done" if defined $data->{done} and length $data->{done};
+            $severity = $data->{severity} if length $data->{severity};
+
+            my $k = sprintf "%s %d %d %s [%s] %s %s\n",
+                 $pkglist, $bug, $data->{date}, $whendone,
+                      $data->{originator}, $severity, $data->{keywords};
+            $bugs{$bug} = $k;
+       }
+       update_realtime("$config{spool_dir}/index.db.realtime", %bugs);
 
        &unfilelock;
 }