allow specifying the dist in source_to_binary (for DB actions)

[debbugs.git] / Debbugs / Status.pm

diff --git a/Debbugs/Status.pm b/Debbugs/Status.pm
index bc5e2be623370b0c8bcc5f8bcdc13d15e6a51267..29bd0d6cfa64f6556b86fc261f13d126b125f567 100644 (file)
--- a/Debbugs/Status.pm
+++ b/Debbugs/Status.pm
@@ -1010,16 +1010,16 @@ sub bug_archiveable{
      # If we just are checking if the bug can be archived, we'll not even bother
      # checking the versioning information if the bug has been -done for less than 28 days.
      my $log_file = getbugcomponent($param{bug},'log');
-     if (not defined $log_file) {
+     if (not defined $log_file or not -e $log_file) {
          print STDERR "Cannot archive $param{bug} because the log doesn't exist\n" if $DEBUG;
          return $cannot_archive;
      }
-     my $max_log_age = max(map {$config{remove_age} - -M $_}
-                          $log_file, map {my $log = getbugcomponent($_,'log');
+     my @log_files = $log_file, (map {my $log = getbugcomponent($_,'log');
                                           defined $log ? ($log) : ();
                                      }
-                          split / /, $status->{mergedwith}
-                      );
+                          split / /, $status->{mergedwith});
+     my $max_log_age = max(map {-e $_?($config{remove_age} - -M _):0}
+                          @log_files);
      if (not $param{days_until} and not $param{ignore_time}
         and $max_log_age > 0
        ) {
@@ -1371,7 +1371,7 @@ sub get_bug_statuses {
                 exists $param{bug_index}{$bug}) {
                 my %status = %{$param{bug_index}{$bug}};
                 $status{pending} = $status{status};
-                $status{id} = $param{bug};
+                $status{id} = $bug;
                 $statuses{$bug} = \%status;
             }
             elsif (defined $param{status} and
@@ -1382,6 +1382,7 @@ sub get_bug_statuses {
                 my $location = getbuglocation($bug, 'summary');
                 next if not defined $location or not length $location;
                 my %status = %{ readbug( $bug, $location ) };
+                $status{id} = $bug;
                 $statuses{$bug} = \%status;
             }
         }