From fdebf806dfc94d88e5b2937ac1cdd4d3eec4970c Mon Sep 17 00:00:00 2001 From: cjwatson <> Date: Tue, 28 Jan 2003 23:52:08 -0800 Subject: [PATCH] [project @ 2003-01-28 23:52:08 by cjwatson] Add a $gHTMLSuffix variable so that we can stop breaking content negotiation on bugs.debian.org while still having the links in the debbugs package work. --- UPGRADE | 7 +++++++ cgi/pkgreport.cgi | 4 ++-- scripts/config.debian | 3 ++- scripts/config.in | 3 ++- scripts/process.in | 4 ++-- scripts/receive.in | 8 ++++---- 6 files changed, 19 insertions(+), 10 deletions(-) diff --git a/UPGRADE b/UPGRADE index ff61fd0..0df0d95 100644 --- a/UPGRADE +++ b/UPGRADE @@ -2,6 +2,13 @@ Debbugs upgrade notes +=====================+ +From 2.4 to 2.4.1 +----------------- + +Add the following variables to the /etc/debbugs/config file: + +$gHTMLSuffix = ".html"; + From 2.3 to 2.4 --------------- diff --git a/cgi/pkgreport.cgi b/cgi/pkgreport.cgi index 8ecd8b6..7d79181 100755 --- a/cgi/pkgreport.cgi +++ b/cgi/pkgreport.cgi @@ -215,7 +215,7 @@ if (defined $pkg || defined $src) { my @references; my $pseudodesc = getpseudodesc(); if (defined($pseudodesc) and exists($pseudodesc->{$pkg})) { - push @references, "to the list of other pseudo-packages"; + push @references, "to the list of other pseudo-packages"; } else { push @references, sprintf "to the %s package page", urlsanit("http://${debbugs::gPackagePages}/$pkg"), htmlsanit("$pkg"); } @@ -228,7 +228,7 @@ if (defined $pkg || defined $src) { } print "

If you find a bug not listed here, please\n"; printf "report it.

\n", - urlsanit("http://${debbugs::gWebDomain}/Reporting.html"); + urlsanit("http://${debbugs::gWebDomain}/Reporting${debbugs::gHTMLSuffix}"); } else { print "

There is no record of the " . (defined($pkg) ? htmlsanit($pkg) . " package" diff --git a/scripts/config.debian b/scripts/config.debian index 19b4ccd..750f238 100644 --- a/scripts/config.debian +++ b/scripts/config.debian @@ -1,10 +1,11 @@ # This is the bugs.debian.org debbugs configuration file. -# $Id: config.debian,v 1.15 2002/11/17 22:45:16 cjwatson Exp $ +# $Id: config.debian,v 1.16 2003/01/28 23:52:08 cjwatson Exp $ # Domains $gEmailDomain = "bugs.debian.org"; $gListDomain = "lists.debian.org"; $gWebDomain = "www.debian.org/Bugs"; +$gHTMLSuffix = ""; $gPackagePages = "packages.debian.org"; $gCGIHost = "bugs.debian.org"; $gCGIPath = "/cgi-bin/"; diff --git a/scripts/config.in b/scripts/config.in index 1371059..d885705 100644 --- a/scripts/config.in +++ b/scripts/config.in @@ -1,6 +1,6 @@ # This is the template debbugs configuration file. # You *must* edit it in order for debbugs to work. -# $Id: config.in,v 1.16 2002/11/17 22:45:16 cjwatson Exp $ +# $Id: config.in,v 1.17 2003/01/28 23:52:08 cjwatson Exp $ # Domains $gEmailDomain = "bugs.something"; # e.g. bugs.debian.org @@ -9,6 +9,7 @@ $gWebHost = "localhost"; # e.g. www.debian.org $gWebHostBugDir = "Bugs"; # e.g. Bugs # For now, don't change this one manually! $gWebDomain = "$gWebHost/$gWebHostBugDir"; +$gHTMLSuffix = ".html"; $gCGIDomain = "$gWebDomain/Bugs/cgi"; # e.g. cgi.debian.org $gMirrors = ""; # comma separated list $gPackagePages = "packages.debian.org"; # e.g. packages.debian.org diff --git a/scripts/process.in b/scripts/process.in index ddc85e4..a1aa8c2 100755 --- a/scripts/process.in +++ b/scripts/process.in @@ -1,5 +1,5 @@ #!/usr/bin/perl -# $Id: process.in,v 1.58 2003/01/05 17:54:23 cjwatson Exp $ +# $Id: process.in,v 1.59 2003/01/28 23:52:08 cjwatson Exp $ # # Usage: process nn # Temps: incoming/Pnn @@ -482,7 +482,7 @@ pseudo-header at all. This makes it much harder for us to categorise and deal with your problem report. Please _resubmit_ your report and tell us which package -the report is on. For help, check out http://$gWebDomain/Reporting.html. +the report is on. For help, check out http://$gWebDomain/Reporting$gHTMLSuffix. Your message was dated $header{'date'} and had message-id $header{'message-id'} diff --git a/scripts/receive.in b/scripts/receive.in index 2fe600f..fdede3d 100755 --- a/scripts/receive.in +++ b/scripts/receive.in @@ -1,5 +1,5 @@ #!/usr/bin/perl -# $Id: receive.in,v 1.14 2002/11/17 22:45:16 cjwatson Exp $ +# $Id: receive.in,v 1.15 2003/01/28 23:52:08 cjwatson Exp $ # usage: mail is piped directly into program #set umask in order to have group-writable incoming/* @@ -95,9 +95,9 @@ $gBadEmailPrefix (all \@$gEmailDomain.) $gBadEmailPrefix $gBadEmailPrefix For instructions via the WWW see: $gBadEmailPrefix http://$gWebDomain/ -$gBadEmailPrefix http://$gWebDomain/Reporting.html -$gBadEmailPrefix http://$gWebDomain/Developer.html -$gBadEmailPrefix http://$gWebDomain/Access.html +$gBadEmailPrefix http://$gWebDomain/Reporting$gHTMLSuffix +$gBadEmailPrefix http://$gWebDomain/Developer$gHTMLSuffix +$gBadEmailPrefix http://$gWebDomain/Access$gHTMLSuffix $gTextInstructions $gBadEmailPrefix For details of how to access $gBug report logs by email: $gBadEmailPrefix send \`request\@$gEmailDomain' the word \`help' -- 2.39.2