From: Don Armstrong <don@donarmstrong.com>
Date: Wed, 11 Apr 2018 23:33:04 +0000 (-0700)
Subject: handle non-existant logs earlier in bug_archiveable
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=7fdace8e5fe1125bfb56468886adb60b0cb08b50;p=debbugs.git

handle non-existant logs earlier in bug_archiveable
---

diff --git a/Debbugs/Status.pm b/Debbugs/Status.pm
index bc5e2be..a5921e2 100644
--- 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
 	) {