Indicate correctly when merged bugs can be archived

diff --git a/Debbugs/Status.pm b/Debbugs/Status.pm
index dac6d75944aee1c29f80f2d9fbf615caab30343b..d69e7a755bffcff30678faa4a0184f51c1322882 100644 (file)
--- a/Debbugs/Status.pm
+++ b/Debbugs/Status.pm
@@ -705,7 +705,10 @@ sub bug_archiveable{
          return $param{days_until}?0:1;
      }
      # 6. at least 28 days have passed since the last action has occured or the bug was closed
-     my $age = ceil($config{remove_age} - -M getbugcomponent($param{bug},'log'));
+     my $age = ceil(max(map {$config{remove_age} - -M getbugcomponent($_,'log')} 
+                       $param{bug}, split / /, $status->{mergedwith}
+                      )
+                  );
      if ($age > 0 or $min_archive_days > 0) {
          return $param{days_until}?max($age,$min_archive_days):0;
      }