[project @ 2003-08-06 10:57:23 by cjwatson]

Allow $gRemoveAge == 0 to mean "don't expire bugs".

diff --git a/scripts/config.debian b/scripts/config.debian
index 6153839a7219cd6b2f824b9ab228185a7f94f635..02ea7fd3ce6c5e98c4a3956e78bfd5666a22ef8a 100644 (file)
--- 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 31320ec215d361b01fa7b0ede8c20f3ab87598f5..02ec2adc83167fe959016128a121aab0fb3176b8 100644 (file)
--- 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 6c4b7c9c1f7f215abe3d27a27ca0e165d87b4703..df45f848eee71b9abfe1beff5e84c14b98796de6 100755 (executable)
--- 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=<stampfile>] [-lastrun=<days>] <wwwbase>
 
 #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 d2284036212650886099c51a0793ac204c960734..08a49d58a18cf79c472ca6eed5b54cb35eeae9cd 100755 (executable)
--- 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 03bad9cdb30c2c9ca6e26ea80229f927a99422bc..5ae31922b863b38e3b6a4eafde9a25344ab76776 100755 (executable)
--- 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 <code>$tryref</code>.");
+        my $archivenote = '';
+        if ($gRemoveAge) {
+            $archivenote = <<END;
+This may be because that $gBug report has been resolved for more than $gRemoveAge
+days, and the record of it has been expunged, or because you mistyped
+the $gBug report number.
+
+END
+        }
         &sendmessage(<<END, '');
 From: $gMaintainerEmail ($gProject $gBug Tracking System)
 To: $replyto
@@ -202,11 +211,7 @@ You sent a message to the $gBug tracking system which gave (in the
 Subject line or encoded into the recipient at $gEmailDomain),
 the number of a nonexistent $gBug report (#$tryref).
 
-This may be because that $gBug report has been resolved for more than $gRemoveAge
-days, and the record of it has been expunged, or because you mistyped
-the $gBug report number.
-
-Your message was dated $header{'date'} and was sent to
+${archivenote}Your message was dated $header{'date'} and was sent to
 $baddress\@$gEmailDomain.  It had
 Message-ID $header{'message-id'}
 and Subject $subject.