remove debbugging messages from Debbugs::SOAP

[debbugs.git] / Debbugs / Status.pm

diff --git a/Debbugs/Status.pm b/Debbugs/Status.pm
index 55ed9354da6f659a9f66b8a6e730e3d3570296fa..6b6fabd3654442c21be344740b31e578268a860e 100644 (file)
--- a/Debbugs/Status.pm
+++ b/Debbugs/Status.pm
@@ -698,7 +698,7 @@ sub bug_archiveable{
               last if $buggy eq 'found';
               $min_fixed_time = min($time_versions{$version},$min_fixed_time);
          }
-         $min_archive_days = max($min_archive_days,ceil((time - $min_fixed_time)/(60*60*24)));
+         $min_archive_days = max($min_archive_days,ceil($config{remove_age} - (time - $min_fixed_time)/(60*60*24)));
      }
      # If $param{ignore_time}, then we should ignore time.
      if ($param{ignore_time}) {
@@ -1005,18 +1005,20 @@ sub max_buggy{
      # Resolve bugginess states (we might be looking at multiple
      # architectures, say). Found wins, then fixed, then absent.
      my $maxbuggy = 'absent';
-     for my $version (@{$param{sourceversions}}) {
-         my $buggy = buggy(bug => $param{bug},
-                           version => $version,
-                           found => $param{found},
-                           fixed => $param{fixed},
-                           version_cache => $param{version_cache},
-                           package => $param{package},
-                          );
-         if ($buggy eq 'found') {
-              return 'found';
-         } elsif ($buggy eq 'fixed') {
-              $maxbuggy = 'fixed';
+     for my $package (split /\s*,\s*/, $param{package}) {
+         for my $version (@{$param{sourceversions}}) {
+              my $buggy = buggy(bug => $param{bug},
+                                version => $version,
+                                found => $param{found},
+                                fixed => $param{fixed},
+                                version_cache => $param{version_cache},
+                                package => $package,
+                               );
+              if ($buggy eq 'found') {
+                   return 'found';
+              } elsif ($buggy eq 'fixed') {
+                   $maxbuggy = 'fixed';
+              }
          }
      }
      return $maxbuggy;