From: don <>
Date: Fri, 29 Jul 2005 11:34:11 +0000 (-0800)
Subject: [project @ 2005-07-29 04:34:11 by don]
X-Git-Tag: release/2.6.0~675
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=08247c97f8711aa1de161c9cd5036ecd1019f746;p=debbugs.git

[project @ 2005-07-29 04:34:11 by don]
* Add an appropriate X-$gProject-PR-Message: list inactivebug for
   archived or non-existant bugs for list related messages.
 * Display old severity when changing severity (closes: #196947)
---

diff --git a/debian/changelog b/debian/changelog
index 59cf7aa0..e6f037e5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -75,6 +75,7 @@ debbugs (2.4.2) UNRELEASED; urgency=low
       with &trim=no (closes: #188561)
     - Fix postfix instructions in README.mail (thanks to Jeff Teunissen)
       (closes: #134166)
+    - Display old severity when changing severity (closes: #196947)
 
  -- Colin Watson <cjwatson@debian.org>  Fri, 20 Jun 2003 18:57:25 +0100
 
diff --git a/scripts/process.in b/scripts/process.in
index 21bf8af3..cdc1d109 100755
--- a/scripts/process.in
+++ b/scripts/process.in
@@ -1,5 +1,5 @@
 #!/usr/bin/perl
-# $Id: process.in,v 1.98 2005/07/26 04:30:53 don Exp $
+# $Id: process.in,v 1.99 2005/07/29 04:34:11 don Exp $
 #
 # Usage: process nn
 # Temps:  incoming/Pnn
@@ -1205,11 +1205,15 @@ sub bug_list_forward{
 	  $envelope_from =~ s/^.+?<([^>]+)>.+$/$1/;
      }
      my ($header,$body) = split /\n\n/, $bug_message, 2;
-     # Add X-$gProject-PR-Message: list bug_number, package name, and bug title headers
-     $header .= qq(\nX-$gProject-PR-Message: list $bug_number\n).
-	  qq(X-$gProject-PR-Package: $data->{package}\n).
-	       qq(X-$gProject-PR-Title: $data->{subject})
-	       if defined $data;
+     # Add X-$gProject-PR-Message: list bug_number and package name headers
+     if (defined $data and $bfound) {
+	  $header .= qq(\nX-$gProject-PR-Message: list $bug_number\n).
+	       qq(X-$gProject-PR-Package: $data->{package}\n).
+		    qq(X-$gProject-PR-Title: $data->{subject});
+     }
+     else {
+	  $header .= qq(\nX-$gProject-PR-Message: list inactivebug);
+     }
      print STDERR "Tried to loop me with $envelope_from\n"
 	  and exit 1 if $envelope_from =~ /\Q$gListDomain\E|\Q$gEmailDomain\E/;
      print DEBUG $envelope_from,qq(\n);
diff --git a/scripts/service.in b/scripts/service.in
index 9dfca819..af361b0a 100755
--- a/scripts/service.in
+++ b/scripts/service.in
@@ -1,5 +1,5 @@
 #!/usr/bin/perl
-# $Id: service.in,v 1.107 2005/07/24 18:42:41 don Exp $
+# $Id: service.in,v 1.108 2005/07/29 04:34:11 don Exp $
 #
 # Usage: service <code>.nn
 # Temps:  incoming/P<code>.nn
@@ -498,7 +498,7 @@ END
         } elsif (&setbug) {
             $printseverity= $data->{severity};
             $printseverity= "$gDefaultSeverity" if $printseverity eq '';
-	    $action= "Severity set to \`$newseverity'.";
+	    $action= "Severity set to \`$newseverity' from \`$printseverity'";
 	    do {
                 &addmaintainers($data);
                 if (defined $gStrongList and isstrongseverity($newseverity)) {