From: cjwatson <> Date: Wed, 29 Jan 2003 06:59:47 +0000 (-0800) Subject: [project @ 2003-01-28 22:59:47 by cjwatson] X-Git-Tag: release/2.6.0~964 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=673d85547f13a3c564996d47a88d2d737f1ef07c;p=debbugs.git [project @ 2003-01-28 22:59:47 by cjwatson] Display package, maintainer, and source links correctly when a bug is filed against multiple packages; patch from H. S. Teoh, #172710. (Multi-package bugs can't yet be displayed in the correct set of pkgreport.cgi pages, though.) --- diff --git a/cgi/bugreport.cgi b/cgi/bugreport.cgi index 8c755e9..b2c82cf 100755 --- a/cgi/bugreport.cgi +++ b/cgi/bugreport.cgi @@ -81,7 +81,7 @@ EOF $|=1; $tpack = lc $status{'package'}; -$tpack =~ s/[^-+._a-z0-9()].*$//; +my @tpacks = splitpackages($tpack); if ($status{severity} eq 'normal') { $showseverity = ''; @@ -92,8 +92,7 @@ if ($status{severity} eq 'normal') { } $indexentry .= "
$showseverity";
-$indexentry .= "Package: "
- .htmlsanit($status{package}).";\n";
+$indexentry .= htmlpackagelinks($status{package});
$indexentry .= "Reported by: " . htmlsanit($status{originator}) . ";\n";
@@ -127,14 +126,17 @@ if (length($status{done})) {
$indexentry .= join(";\n", @descstates) . ";\n
" if @descstates;
-my ($tmaint, $tsrc);
-$tmaint = defined($maintainer{$tpack}) ? $maintainer{$tpack} : '(unknown)';
-$tsrc = defined($pkgsrc{$tpack}) ? $pkgsrc{$tpack} : '(unknown)';
-$descriptivehead= $indexentry."Maintainer for $status{package} is\n".
+$descriptivehead = $indexentry;
+foreach my $pkg (@tpacks) {
+ my $tmaint = defined($maintainer{$pkg}) ? $maintainer{$pkg} : '(unknown)';
+ my $tsrc = defined($pkgsrc{$pkg}) ? $pkgsrc{$pkg} : '(unknown)';
+
+ $descriptivehead .= "Maintainer for $pkg is\n".
''.htmlsanit($tmaint).'';
-$descriptivehead.= ";\nSource for $status{package} is\n".
- '$tsrc" if ($tsrc ne "(unknown)");
-$descriptivehead.= ".