Add affects to bugreport.cgi package info header (Closes: #609687).

diff --git a/cgi/bugreport.cgi b/cgi/bugreport.cgi
index 3899a9defe715f2486770d1285cafe01fd17cb4b..9064ca8c0565abf666dd397031f3973f86bc2998 100755 (executable)
--- a/cgi/bugreport.cgi
+++ b/cgi/bugreport.cgi
@@ -307,24 +307,30 @@ unless (%status) {
 
 #$|=1;
 
 
 #$|=1;
 

-my %package;
+

 my @packages = make_list($status{package});
 
 my @packages = make_list($status{package});
 

-foreach my $pkg (@packages) {
-     if ($pkg =~ /^src\:/) {
-         my ($srcpkg) = $pkg =~ /^src:(.*)/;
-         $package{$pkg} = {maintainer => exists($maintainer{$srcpkg}) ? $maintainer{$srcpkg} : '(unknown)',
-                           source     => $srcpkg,
-                           package    => $pkg,
-                           is_source  => 1,
-                          };
-     }
-     else {
-         $package{$pkg} = {maintainer => exists($maintainer{$pkg}) ? $maintainer{$pkg} : '(unknown)',
-                           exists($pkgsrc{$pkg}) ? (source => $pkgsrc{$pkg}) : (),
-                           package    => $pkg,
-                          };
-     }
+
+my %packages_affects;
+for my $p_a (qw(package affects)) {
+    foreach my $pkg (make_list($status{$p_a})) {
+        if ($pkg =~ /^src\:/) {
+            my ($srcpkg) = $pkg =~ /^src:(.*)/;
+            $packages_affects{$p_a}{$pkg} =
+               {maintainer => exists($maintainer{$srcpkg}) ? $maintainer{$srcpkg} : '(unknown)',
+                source     => $srcpkg,
+                package    => $pkg,
+                is_source  => 1,
+               };
+        }
+        else {
+            $packages_affects{$p_a}{$pkg} =
+               {maintainer => exists($maintainer{$pkg}) ? $maintainer{$pkg} : '(unknown)',
+                exists($pkgsrc{$pkg}) ? (source => $pkgsrc{$pkg}) : (),
+                package    => $pkg,
+               };
+        }
+    }

 }
 
 # fixup various bits of the status
 }
 
 # fixup various bits of the status


@@ -387,7 +393,8 @@ print $q->header(-type => "text/html",
 
 print fill_in_template(template => 'cgi/bugreport',
                       variables => {status => \%status,
 
 print fill_in_template(template => 'cgi/bugreport',
                       variables => {status => \%status,

-                                    package => \%package,
+                                    package => $packages_affects{'package'},
+                                    affects => $packages_affects{'affects'},

                                     log           => $log,
                                     bug_num       => $ref,
                                     version_graph => $version_graph,
                                     log           => $log,
                                     bug_num       => $ref,
                                     version_graph => $version_graph,

diff --git a/debian/changelog b/debian/changelog
index 584111eb50fa9cac852e77129d3c435aa70a7fd6..7f8ef530b64208efd609875f3eb52d92a29c179c 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -26,6 +26,7 @@ debbugs (2.4.2~exp2) UNRELEASED; urgency=low
   * Add reply links to individual bug messages with headers (closes:
     #412815). Thanks to martin krafft, Paul Wise, and Julien Valroff.
   * Fix XSS in version.cgi, thanks to Vlad Constantin (Closes: #762967).
   * Add reply links to individual bug messages with headers (closes:
     #412815). Thanks to martin krafft, Paul Wise, and Julien Valroff.
   * Fix XSS in version.cgi, thanks to Vlad Constantin (Closes: #762967).

+  * Add affects to bugreport.cgi package info header (Closes: #609687).

 
   [Thanks to Arnout Engelen: ]
   * Add Homepage (closes: #670555).
 
   [Thanks to Arnout Engelen: ]
   * Add Homepage (closes: #670555).

diff --git a/templates/en_US/cgi/bugreport_pkginfo.tmpl b/templates/en_US/cgi/bugreport_pkginfo.tmpl
index 872aff44fc0913a75b4c0c0789a79fd2ef169c75..777928ed712adbe064ae74935d88022d52937d4a 100644 (file)
--- a/templates/en_US/cgi/bugreport_pkginfo.tmpl
+++ b/templates/en_US/cgi/bugreport_pkginfo.tmpl
@@ -16,4 +16,16 @@
  }
  $output;
 }</p>
  }
  $output;
 }</p>

+{ my $output = '';
+  if (keys %affects) {
+      $output .= q(<p>Affects: ).
+          join(q(, ),
+               package_links(package => [map {$_->{package}} grep {!$_->{is_source}} values %affects],
+                             source  => [map {$_->{source} } grep { $_->{is_source}} values %affects],
+                             class => q(submitter),
+                            )
+              ).q(</p>);
+  }
+  $output;
+}

 </div>
 </div>