From: Don Armstrong <don@volo>
Date: Thu, 6 Jul 2006 00:40:17 +0000 (-0700)
Subject:  * merge in changes to fix blocking bugs
X-Git-Tag: release/2.6.0~604^2~4
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=a7becce9a339ff6720c706300577a733501136a8;p=debbugs.git

 * merge in changes to fix blocking bugs
---

diff --git a/debian/changelog b/debian/changelog
index 5fbd4b18..113b733f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -115,6 +115,9 @@ debbugs (2.4.2) UNRELEASED; urgency=low
     - Add X-$gProject-PR-Source: line (closes: #219230)
     - Use the %cats data structure properly in pkgreport.cgi
       (closes: #367514)  
+    - Document nnn.*@foobar addresses (closes: #188670)
+    - Support cloned bugs in control blocking (closes: #337329)
+    - Indicate which bugs are blocked after blocking (closes: #367496)
   
   
  -- Colin Watson <cjwatson@debian.org>  Fri, 20 Jun 2003 18:57:25 +0100
diff --git a/scripts/service.in b/scripts/service.in
index 19e8bb31..fdf1fa80 100755
--- a/scripts/service.in
+++ b/scripts/service.in
@@ -762,11 +762,11 @@ END
 		&transcript("Was blocked by: $data->{blockedby}\n");
 	    }
 	    if ($addsub eq "set") {
-		$action= "Blocking bugs set to: " . join(", ", @okayblockers);
+		$action= "Blocking bugs of $bugnum set to: " . join(", ", @okayblockers);
 	    } elsif ($addsub eq "add") {
-		$action= "Blocking bugs added: " . join(", ", @okayblockers);
+		$action= "Blocking bugs of $bugnum added: " . join(", ", @okayblockers);
 	    } elsif ($addsub eq "sub") {
-		$action= "Blocking bugs removed: " . join(", ", @okayblockers);
+		$action= "Blocking bugs of $bugnum removed: " . join(", ", @okayblockers);
 	    }
 	    my %removedblocks;
 	    my %addedblocks;