From: Don Armstrong <don@donarmstrong.com>
Date: Mon, 8 Feb 2010 10:44:19 +0000 (-0800)
Subject: Fix source package src: urls (closes: #567439). Thanks to Paul Wise.
X-Git-Tag: release/2.6.0~427^2
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=c31c947deb20a575dd2c7cc1fd292fd9e07b9646;p=debbugs.git

Fix source package src: urls (closes: #567439). Thanks to Paul Wise.
---

diff --git a/Debbugs/CGI/Bugreport.pm b/Debbugs/CGI/Bugreport.pm
index ba4c7a4..2359837 100644
--- a/Debbugs/CGI/Bugreport.pm
+++ b/Debbugs/CGI/Bugreport.pm
@@ -35,6 +35,7 @@ use Params::Validate qw(validate_with :types);
 use Debbugs::MIME qw(convert_to_utf8 decode_rfc1522 create_mime_message);
 use Debbugs::CGI qw(:url :html :util);
 use Debbugs::Common qw(globify_scalar english_join);
+use Debbugs::Config qw(:config);
 use POSIX qw(strftime);
 
 BEGIN{
diff --git a/Debbugs/CGI/Pkgreport.pm b/Debbugs/CGI/Pkgreport.pm
index d047aff..e87125c 100644
--- a/Debbugs/CGI/Pkgreport.pm
+++ b/Debbugs/CGI/Pkgreport.pm
@@ -107,7 +107,8 @@ sub generate_package_info{
      }
      else {
 	  print {$output} "<p>There is no maintainer for $showpkg. ".
-	       "Please do not report new bugs against this package.</p>\n";
+	       "This means that this package no longer exists (or never existed). ".
+		   "Please do not report new bugs against this package. </p>\n";
      }
      my @pkgs = getsrcpkgs($srcforpkg);
      @pkgs = grep( !/^\Q$package\E$/, @pkgs );
@@ -130,9 +131,11 @@ sub generate_package_info{
 	       "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>";
+	# don't bother printing out this information, because it's
+	# already present above.
+     	#  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}) {
diff --git a/debian/changelog b/debian/changelog
index 4b03178..8679d39 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,7 +18,7 @@ debbugs (2.4.2~exp1) experimental; urgency=low
     Thanks to Martin Krafft.
   * Properly handle Forwarded: at submit@ time (closes: #568020). Thanks
     to Martin Krafft.
-  * Fix source package src: urls
+  * Fix source package src: urls (closes: #567439). Thanks to Paul Wise.
   * Use package_maintainer to search for packages maintained by a
     maintainer (closes: #556863). Thanks to Yves-Alexis Perez.
   * Linkify CVE reports (closes: #568464). Thanks to Martin Zobel-Helas.