From: Don Armstrong <don@donarmstrong.com>
Date: Wed, 27 Jun 2007 06:01:42 +0000 (-0700)
Subject: Indicate correctly when merged bugs can be archived
X-Git-Tag: release/2.6.0~530^2
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=4e857d7c73cb3a360ae20debd2ada03c30f8faa3;p=debbugs.git

Indicate correctly when merged bugs can be archived
---

diff --git a/Debbugs/Status.pm b/Debbugs/Status.pm
index dac6d759..d69e7a75 100644
--- 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;
      }