From f225b4f57019db7f427061b3c85265e70656c308 Mon Sep 17 00:00:00 2001 From: cjwatson <> Date: Wed, 6 Aug 2003 09:57:23 -0800 Subject: [PATCH] [project @ 2003-08-06 10:57:23 by cjwatson] Allow $gRemoveAge == 0 to mean "don't expire bugs". --- scripts/config.debian | 5 +++-- scripts/config.in | 5 +++-- scripts/db2html.in | 5 +++-- scripts/expire.in | 5 ++++- scripts/process.in | 17 +++++++++++------ 5 files changed, 24 insertions(+), 13 deletions(-) diff --git a/scripts/config.debian b/scripts/config.debian index 6153839..02ea7fd 100644 --- a/scripts/config.debian +++ b/scripts/config.debian @@ -1,5 +1,5 @@ # This is the bugs.debian.org debbugs configuration file. -# $Id: config.debian,v 1.20 2003/06/05 08:26:59 cjwatson Exp $ +# $Id: config.debian,v 1.21 2003/08/06 10:57:23 cjwatson Exp $ # Domains $gEmailDomain = "bugs.debian.org"; @@ -34,7 +34,8 @@ $gMirrorList = "debian-bugs-mirror"; # sends to all mirrors $gMailer = "exim"; # valid: exim, qmail and sendmail $gBug = "Bug"; # how to spell `bug' $gBugs = "Bugs"; # how to spell `bugs' -$gRemoveAge = 28; # days after closed bugs are cleaned out +$gRemoveAge = 28; # days after closed bugs are cleaned out, + # 0 disables $gSaveOldBugs = 1; # whether to archive such bugs $gDefaultSeverity = "normal"; $gShowSeverities = "critical, grave, serious, important, normal, minor, wishlist, fixed"; diff --git a/scripts/config.in b/scripts/config.in index 31320ec..02ec2ad 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.18 2003/06/04 18:05:51 cjwatson Exp $ +# $Id: config.in,v 1.19 2003/08/06 10:57:23 cjwatson Exp $ # Domains $gEmailDomain = "bugs.something"; # e.g. bugs.debian.org @@ -42,7 +42,8 @@ $gMirrorList = "bug-mirrors-list"; # sends to all mirrors $gMailer = "exim"; # valid: exim, qmail and sendmail $gBug = "bug"; # how to spell `bug' $gBugs = "bugs"; # how to spell `bugs' -$gRemoveAge = 28; # days after closed bugs are cleaned out +$gRemoveAge = 28; # days after closed bugs are cleaned out, + # 0 disables $gSaveOldBugs = 1; # whether to archive such bugs $gDefaultSeverity = "normal"; $gShowSeverities = "critical, grave, normal, minor, wishlist"; diff --git a/scripts/db2html.in b/scripts/db2html.in index 6c4b7c9..df45f84 100755 --- a/scripts/db2html.in +++ b/scripts/db2html.in @@ -1,5 +1,5 @@ #!/usr/bin/perl -# $Id: db2html.in,v 1.18 2003/05/25 14:43:30 joy Exp $ +# $Id: db2html.in,v 1.19 2003/08/06 10:57:23 cjwatson Exp $ # usage: db2html [-diff] [-stampfile=] [-lastrun=] #load the necessary libraries/configuration @@ -22,7 +22,8 @@ chdir("$gSpoolDir") || die "chdir spool: $!\n"; $diff = 0; $stampfile = 'stamp.html'; $tail_html = $gHTMLTail; -$expirynote_html = $gHTMLExpireNote; +$expirynote_html = ''; +$expirynote_html = $gHTMLExpireNote if $gRemoveAge; $shorthead = ' Ref * Package Keywords/Subject Submitter'; $shortindex = ''; $amonths = -1; diff --git a/scripts/expire.in b/scripts/expire.in index d228403..08a49d5 100755 --- a/scripts/expire.in +++ b/scripts/expire.in @@ -1,5 +1,5 @@ #!/usr/bin/perl -# $Id: expire.in,v 1.16 2003/05/25 13:17:14 cjwatson Exp $ +# $Id: expire.in,v 1.17 2003/08/06 10:57:23 cjwatson Exp $ # Load modules and set envirnment use File::Copy; @@ -11,6 +11,9 @@ require("$config_path/text"); require("$lib_path/errorlib"); $ENV{'PATH'} = $lib_path.':'.$ENV{'PATH'}; +# No $gRemoveAge means "never expire". +exit 0 unless $gRemoveAge; + chdir("$gSpoolDir") || die "chdir spool: $!\n"; #global variables diff --git a/scripts/process.in b/scripts/process.in index 03bad9c..5ae3192 100755 --- a/scripts/process.in +++ b/scripts/process.in @@ -1,5 +1,5 @@ #!/usr/bin/perl -# $Id: process.in,v 1.76 2003/07/18 14:41:11 cjwatson Exp $ +# $Id: process.in,v 1.77 2003/08/06 10:57:23 cjwatson Exp $ # # Usage: process nn # Temps: incoming/Pnn @@ -188,6 +188,15 @@ if ($tryref >= 0) $ref= $tryref; } else { &htmllog("Reply","sent", $replyto,"Unknown problem report number $tryref."); + my $archivenote = ''; + if ($gRemoveAge) { + $archivenote = <