[project @ 1999-12-17 19:44:07 by gecko]

Added CNAME severity=>priority to both process (submit@) and service
(control@)  Part from a patch from netgod

diff --git a/debian/changelog b/debian/changelog
index b208ceec0b2e2f70d819e18f4091700885672f60..0930ad25c9ff8dd1ea14898f08eaafc647631f20 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,7 +3,8 @@ debbugs (2.3-2) unstable; urgency=low
   * Tweeks to the [pkg|bug]report.cgi scripts
   * Merged README and README.Debian
   * Sundry of patchs from netgod.. see list archives for details :)
-    (#36147, #39540, #39063, 
+    (#36147, #39540, #39063)
+  * Provided a CNAME in control@ as well as submit@ for severity
 
  -- Darren Benham <gecko@debian.org>  Tue, 24 Oct 1999 23:16:14 -0700
 

diff --git a/scripts/process.in b/scripts/process.in
index 694b8de87dd353158c09d09b97095a875f47b062..ea4127c8cd3aec1a08682dabc5438c2105ccef95 100755 (executable)
--- a/scripts/process.in
+++ b/scripts/process.in
@@ -1,5 +1,5 @@
 #!/usr/bin/perl
-# $Id: process.in,v 1.10 1999/10/25 01:35:04 gecko Exp $
+# $Id: process.in,v 1.11 1999/12/17 19:44:08 gecko Exp $
 #
 # Usage: process nn
 # Temps:  incoming/Pnn
@@ -8,7 +8,6 @@ use Mail::Address;
 require( '/etc/debbugs/config' );
 require( '/usr/lib/debbugs/errorlib' );
 chdir( "$gSpoolDir" ) || die 'chdir spool: $!\n';
-@showseverities=();
 
 #open(DEBUG,"> /tmp/debbugs.debug");
 
@@ -407,7 +406,7 @@ X-$gProject-PR-Message: error
 
 Your message didn't have a Package: line at the start (in the
 pseudo-header following the real mail header), or didn't have a
-psuedo-header at all.
+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
@@ -430,15 +429,17 @@ END
         $s_keywords= $pheader{'keywords'};
     }
     $s_severity= '';
-    if (defined($pheader{'severity'})) {
-        $s_severity= $pheader{'severity'};
-       if (!grep($_ eq $s_severity, @severities, "$gDefaultSeverity")) {
+       if (defined($pheader{'severity'}) || defined($pheader{'priority'})) 
+       {       $s_severity= $pheader{'severity'};
+           $s_severity= $pheader{'priority'} unless ($s_severity);
+
+               if (!grep($_ eq $s_severity, @severities, "$gDefaultSeverity")) {
             $brokenness.= <<END;
 
-Your message specified a Severity: in the psuedo-header, but
+Your message specified a Severity: in the pseudo-header, but
 the severity value $s_severity was not recognised.
 The default severity $gDefaultSeverity is being used instead.
-The recognised values are: @showseverities.
+The recognised values are: @gSeverityList.
 END
             $s_severity= '';
         }
@@ -490,7 +491,7 @@ if ($codeletter eq 'M' && !@maintaddrs) {
 
 You requested that the message be sent to the package maintainer(s)
 but either the $gBug report is not associated with any package (probably
-because of a missing Package psuedo-header field in the original $gBug
+because of a missing Package pseudo-header field in the original $gBug
 report), or the package(s) specified do not have any maintainer(s).
 
 Your message has *not* been sent to any package maintainers; it has

diff --git a/scripts/service.in b/scripts/service.in
index 8d0409e99b0ceed04ed3e686fe3253adc64e4359..2f9967f794cd909b350d9e8ec4dc551f1d406740 100755 (executable)
--- a/scripts/service.in
+++ b/scripts/service.in
@@ -1,5 +1,5 @@
 #!/usr/bin/perl -w
-# $Id: service.in,v 1.9 1999/12/01 18:04:01 gecko Exp $
+# $Id: service.in,v 1.10 1999/12/17 19:44:08 gecko Exp $
 #
 # Usage: service <code>.nn
 # Temps:  incoming/P<code>.nn
@@ -325,7 +325,8 @@ END
                 } while (&getnextbug);
             }
         }
-    } elsif (m/^severity\s+\#?(\d+)\s+([-0-9a-z]+)$/i) {
+    } elsif (m/^severity\s+\#?(\d+)\s+([-0-9a-z]+)$/i ||
+       m/^priority\s+\#?(\d+)\s+([-0-9a-z]+)$/i) {
         $ok++;
         $ref= $1;
         $newseverity= $2;