From e14238b1b663e525ed1fd3ea8717855f2362cc9e Mon Sep 17 00:00:00 2001 From: cjwatson <> Date: Mon, 25 Nov 2002 14:38:50 -0800 Subject: [PATCH] [project @ 2002-11-25 14:38:49 by cjwatson] Point to the list of pseudo-packages rather than packages.debian.org for pseudo-packages (#85347 and others). --- cgi/common.pl | 15 +++++++++++++++ cgi/pkgreport.cgi | 15 +++++++++++---- 2 files changed, 26 insertions(+), 4 deletions(-) diff --git a/cgi/common.pl b/cgi/common.pl index e5090475..99b965cb 100644 --- a/cgi/common.pl +++ b/cgi/common.pl @@ -509,6 +509,21 @@ sub getpkgcomponent { return $_pkgcomponent; } +my $_pseudodesc; +sub getpseudodesc { + return $_pseudodesc if $_pseudodesc; + my %pseudodesc; + + open(PSEUDO, "< $gPseudoDescFile") or &quit("open $gPseudoDescFile: $!"); + while() { + next unless m/^(\S+)\s+(\S.*\S)\s*$/; + $pseudodesc{lc $1} = $2; + } + close(PSEUDO); + $_pseudodesc = \%pseudodesc; + return $_pseudodesc; +} + sub getbugdir { my ( $bugnum, $ext ) = @_; my $archdir = sprintf "%02d", $bugnum % 100; diff --git a/cgi/pkgreport.cgi b/cgi/pkgreport.cgi index ddae7cd5..1cf0b8db 100755 --- a/cgi/pkgreport.cgi +++ b/cgi/pkgreport.cgi @@ -206,11 +206,18 @@ if (defined $pkg || defined $src) { print ".\n"; } if ($pkg) { - printf "

You might like to refer to the %s package page", urlsanit("http://${debbugs::gPackagePages}/$pkg"), htmlsanit("$pkg"); - if ($pkgsrc{ $pkg }) { - printf ", or to the source package %s's bug page.

\n", srcurl($pkgsrc{$pkg}), htmlsanit($pkgsrc{$pkg}); + my @references; + my $pseudodesc = getpseudodesc(); + if (defined($pseudodesc) and exists($pseudodesc->{$pkg})) { + push @references, "to the list of other pseudo-packages"; } else { - printf ".\n"; + push @references, sprintf "to the %s package page", urlsanit("http://${debbugs::gPackagePages}/$pkg"), htmlsanit("$pkg"); + } + if ($pkgsrc{ $pkg }) { + push @references, sprintf "to the source package %s's bug page", srcurl($pkgsrc{$pkg}), htmlsanit($pkgsrc{$pkg}); + } + if (@references) { + print "

You might like to refer ", join(", or ", @references), ".

\n"; } } print "

If you find a bug not listed here, please\n"; -- 2.39.5