remove leading and trailing spaces in references and replyto

[debbugs.git] / Debbugs / CGI / Pkgreport.pm

diff --git a/Debbugs/CGI/Pkgreport.pm b/Debbugs/CGI/Pkgreport.pm
index 57d1cc4d1735d05e08e03ff485e8bbf6ae532bf6..8c217d7e1271c367b6e171d9776470b6540a8a2a 100644 (file)
--- a/Debbugs/CGI/Pkgreport.pm
+++ b/Debbugs/CGI/Pkgreport.pm
@@ -74,7 +74,7 @@ sub generate_package_info{
                               spec  => {binary => {type => BOOLEAN,
                                                    default => 1,
                                                   },
-                                        package => {type => SCALAR|ARRAYREF,
+                                        package => {type => SCALAR,#|ARRAYREF,
                                                    },
                                         options => {type => HASHREF,
                                                    },
@@ -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}) {
@@ -142,6 +145,8 @@ sub generate_package_info{
          if (defined $config{subscription_domain} and
              length $config{subscription_domain}) {
               my $ptslink = $param{binary} ? $srcforpkg : $package;
+              # the pts only wants the source, and doesn't care about src: (#566089)
+              $ptslink =~ s/^src://;
               push @references, q(to the <a href="http://).html_escape("$config{subscription_domain}/$ptslink").q(">Package Tracking System</a>);
          }
          # Only output this if the source listing is non-trivial.
@@ -219,7 +224,7 @@ sub short_bug_status_html {
      if (@blockedby && $status{"pending"} ne 'fixed' && ! length($status{done})) {
          for my $b (@blockedby) {
               my %s = %{get_bug_status($b)};
-              next if $s{"pending"} eq 'fixed' || length $s{done};
+              next if (defined $s{pending} and $s{pending} eq 'fixed') or (defined $s{done} and length $s{done});
               push @{$status{blockedby_array}},{bug_num => $b, subject => $s{subject}, status => \%s};
          }
      }