From: Don Armstrong <don@donarmstrong.com>
Date: Sun, 26 Oct 2008 21:30:51 +0000 (-0700)
Subject: Clean up links when there is no information about a package (closes:
X-Git-Tag: release/2.6.0~467^2~17
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=8e684eb1e99aa7d569088736ab609d94e6482039;p=debbugs.git

Clean up links when there is no information about a package (closes:
#452905)
---

diff --git a/Debbugs/CGI/Pkgreport.pm b/Debbugs/CGI/Pkgreport.pm
index beba95a..feb85a9 100644
--- a/Debbugs/CGI/Pkgreport.pm
+++ b/Debbugs/CGI/Pkgreport.pm
@@ -110,7 +110,8 @@ sub generate_package_info{
 	  print {$output} ".</p>\n";
      }
      else {
-	  print {$output} "<p>No maintainer for $showpkg. Please do not report new bugs against this package.</p>\n";
+	  print {$output} "<p>There is no maintainer for $showpkg. ".
+	       "Please do not report new bugs against this package.</p>\n";
      }
      my @pkgs = getsrcpkgs($srcforpkg);
      @pkgs = grep( !/^\Q$package\E$/, @pkgs );
@@ -132,6 +133,11 @@ sub generate_package_info{
 	  push @references, "to the <a href=\"http://$config{web_domain}/pseudo-packages$config{html_suffix}\">".
 	       "list of other pseudo-packages</a>";
      }
+     elsif (not defined $maint and not @{$param{bugs}}) {
+	  print {$output} "<p>There is no record of the " . html_escape($package) .
+	       ($param{binary} ? " package" : " source package") .
+		    ", and no bugs have been filed against it.</p>";
+     }
      else {
 	  if ($package and defined $config{package_pages} and length $config{package_pages}) {
 	       push @references, sprintf "to the <a href=\"%s\">%s package page</a>",
@@ -160,11 +166,6 @@ sub generate_package_info{
 	  printf {$output} "<a href=\"%s\">report it</a>.</p>\n",
 	       html_escape("http://$config{web_domain}/Reporting$config{html_suffix}");
      }
-     if (not defined $maint and not @{$param{bugs}}) {
-	  print {$output} "<p>There is no record of the " . html_escape($package) .
-	       ($param{binary} ? " package" : " source package") .
-		    ", and no bugs have been filed against it.</p>";
-     }
      return $output_scalar;
 }
 
diff --git a/debian/changelog b/debian/changelog
index 7330bc7..5114cda 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -228,6 +228,8 @@ debbugs (2.4.2) UNRELEASED; urgency=low
   * No longer hard-code paths in age-1 (closes: #499682)
   * Change how maybelink links links (closes: #501757)
   * Use bug_subscription_domain in process (closes: #499680)
+  * Clean up links when there is no information about a package (closes:
+    #452905)
 
   
  -- Colin Watson <cjwatson@debian.org>  Fri, 20 Jun 2003 18:57:25 +0100