[project @ 2003-02-16 15:20:26 by cjwatson]

Disable the fixed severity in favour of the tag.

diff --git a/debian/changelog b/debian/changelog
index 7739e58bf249bfbdfd044a3f12c4946a63557879..87defc6e7f7d4ba1f5ff4f68295140e242c73247 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,7 @@ debbugs (2.4.1) UNRELEASED; urgency=low
     notices that were there due to using it. [Colin]
   * Accept ';' as well as '&' as a CGI argument separator. [Colin]
   * db2html now works with the new hashed database layout. [Colin]
+  * Disable the fixed severity in favour of the tag. [Colin]
 
  -- Colin Watson <cjwatson@debian.org>  Mon, 25 Nov 2002 03:50:20 +0000
 

diff --git a/scripts/config.debian b/scripts/config.debian
index 750f2381e9f01ce6b9460480c69dc5784760d531..a4e5667f5c038e4a16a4d5ec64e26389b555248a 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.16 2003/01/28 23:52:08 cjwatson Exp $
+# $Id: config.debian,v 1.17 2003/02/16 15:20:26 cjwatson Exp $
 
 # Domains
 $gEmailDomain = "bugs.debian.org";
@@ -44,6 +44,7 @@ $gShowSeverities = "critical, grave, serious, important, normal, minor, wishlist
 @gSeverityList = ( "critical", "grave", "serious", "important", "normal",
                    "minor", "wishlist", "fixed"
                  );
+%gObsoleteSeverities = ( fixed => 'Use the fixed tag instead.' );
 %gSeverityDisplay = ( "critical", "Critical bugs",
                       "grave", "Grave functionality bugs",
                       "serious", "Serious policy violations",

diff --git a/scripts/errorlib.in b/scripts/errorlib.in
index e424d2f6b86e84bc97b8ee338da6ad4b35725e04..d86d8389080956569982fc41c86437460ca929df 100755 (executable)
--- a/scripts/errorlib.in
+++ b/scripts/errorlib.in
@@ -1,5 +1,5 @@
 # -*- perl -*-
-# $Id: errorlib.in,v 1.17 2002/11/17 22:45:16 cjwatson Exp $
+# $Id: errorlib.in,v 1.18 2003/02/16 15:20:26 cjwatson Exp $
 
 sub F_SETLK { 6; } sub F_WRLCK{ 1; }
 $flockstruct= 'sslll'; # And there ought to be something for this too.
@@ -218,7 +218,7 @@ sub escapelog {
 }
 
 
-@severities= @gSeverityList;
+@severities= grep { not exists $gObsoleteSeverities{$_} } @gSeverityList;
 @showseverities= @severities;
 grep ($_= $_ eq '' ? $gDefaultSeverity : $_, @showseverities);
 @strongseverities= @gStrongSeverities;

diff --git a/scripts/service.in b/scripts/service.in
index 3cd5e524c6db41b2b0f8a7ba216400f3ffef5583..eb83a10640c3300119e8e77f56d1c5580a627138 100755 (executable)
--- a/scripts/service.in
+++ b/scripts/service.in
@@ -1,5 +1,5 @@
 #!/usr/bin/perl
-# $Id: service.in,v 1.67 2003/02/15 00:44:20 cjwatson Exp $
+# $Id: service.in,v 1.68 2003/02/16 15:20:26 cjwatson Exp $
 # ^ more or less ^
 #
 # Usage: service <code>.nn
@@ -416,6 +416,9 @@ END
         if (!grep($_ eq $newseverity, @gSeverityList, "$gDefaultSeverity")) {
             &transcript("Severity level \`$newseverity' is not known.\n".
                        "Recognized are: $gShowSeverities.\n\n");
+        } elsif (exists $gObsoleteSeverities{$newseverity}) {
+            &transcript("Severity level \`$newseverity' is obsolete. " .
+                        "$gObsoleteSeverities{$newseverity}\n\n");
         } elsif (&setbug) {
             $printseverity= $s_severity;
             $printseverity= "$gDefaultSeverity" if $printseverity eq '';