X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Debbugs%2FStatus.pm;h=8349036ea56fa38f8c36d1eac8a74f88cd418e7e;hb=f4624b44b9b7853fcaf71e9d0b1dcfc3f591e5fc;hp=dac6d75944aee1c29f80f2d9fbf615caab30343b;hpb=0d773d8f9e51ed8923d0f8aaa511ddd9e9fdf2f1;p=debbugs.git

diff --git a/Debbugs/Status.pm b/Debbugs/Status.pm
index dac6d75..8349036 100644
--- a/Debbugs/Status.pm
+++ b/Debbugs/Status.pm
@@ -627,10 +627,21 @@ sub bug_archiveable{
      return $cannot_archive if not defined $status->{done} or not length $status->{done};
      # 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) {
+	  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');
+					   defined $log ? ($log) : ();
+				      }
+			   split / /, $status->{mergedwith}
+		       );
      if (not $param{days_until} and not $param{ignore_time}
-	 and $config{remove_age} >
-	 -M getbugcomponent($param{bug},'log')
+	 and $max_log_age > 0
 	) {
+	  print STDERR "Cannot archive $param{bug} because of time\n" if $DEBUG;
 	  return $cannot_archive;
      }
      # At this point, we have to get the versioning information for this bug.
@@ -668,6 +679,7 @@ sub bug_archiveable{
 				   version_cache  => $version_cache,
 				   package        => $status->{package},
 				  )) {
+	       print STDERR "Cannot archive $param{bug} because it's found\n" if $DEBUG;
 	       return $cannot_archive;
 	  }
 	  # Since the bug has at least been fixed in the architectures
@@ -705,7 +717,7 @@ 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_log_age);
      if ($age > 0 or $min_archive_days > 0) {
 	  return $param{days_until}?max($age,$min_archive_days):0;
      }
@@ -904,9 +916,14 @@ sub bug_presence {
      }
 
      my @sourceversions;
+     my $pseudo_desc = getpseudodesc();
      if (not exists $param{sourceversions}) {
 	  my %sourceversions;
-	  if (defined $param{version}) {
+	  # pseudopackages do not have source versions by definition.
+	  if (exists $pseudo_desc->{$status{package}}) {
+	       # do nothing.
+	  }
+	  elsif (defined $param{version}) {
 	       foreach my $arch (make_list($param{arch})) {
 		    for my $package (split /\s*,\s*/, $status{package}) {
 			 my @temp = makesourceversions($package,
@@ -934,6 +951,7 @@ sub bug_presence {
 
 	  # TODO: This should probably be handled further out for efficiency and
 	  # for more ease of distinguishing between pkg= and src= queries.
+	  # DLA: src= queries should just pass arch=source, and they'll be happy.
 	  @sourceversions = keys %sourceversions;
      }
      else {
@@ -1076,23 +1094,31 @@ sub buggy {
 				     );
      }
      if ($param{version} !~ m{/}) {
-	  $param{version} = makesourceversions($param{package},undef,
-					       $param{version}
-					      );
+	  my ($version) = makesourceversions($param{package},undef,
+					     $param{version}
+					    );
+	  $param{version} = $version if defined $version;
      }
      # Figure out which source packages we need
      my %sources;
      @sources{map {m{(.+)/}; $1} @found} = (1) x @found;
      @sources{map {m{(.+)/}; $1} @fixed} = (1) x @fixed;
-     @sources{map {m{(.+)/}; $1} $param{version}} = 1;
+     @sources{map {m{(.+)/}; $1} $param{version}} = 1 if
+	  $param{version} =~ m{/};
      my $version;
      if (not defined $param{version_cache} or
 	 not exists $param{version_cache}{join(',',sort keys %sources)}) {
 	  $version = Debbugs::Versions->new(\&Debbugs::Versions::Dpkg::vercmp);
 	  foreach my $source (keys %sources) {
 	       my $srchash = substr $source, 0, 1;
-	       my $version_fh = IO::File->new("$config{version_packages_dir}/$srchash/$source", 'r') or
-		    warn "Unable to open $config{version_packages_dir}/$srchash/$source: $!" and next;
+	       my $version_fh = IO::File->new("$config{version_packages_dir}/$srchash/$source", 'r');
+	       if (not defined $version_fh) {
+		    # We only want to warn if it's a package which actually has a maintainer
+		    my $maints = getmaintainers();
+		    next if not exists $maints->{$source};
+		    warn "Bug $param{bug}: unable to open $config{version_packages_dir}/$srchash/$source: $!";
+		    next;
+	       }
 	       $version->load($version_fh);
 	  }
 	  if (defined $param{version_cache}) {