From: Don Armstrong <don@donarmstrong.com>
Date: Sun, 26 Oct 2008 21:45:48 +0000 (-0700)
Subject: Only send out control help when control is mailed (closes: #499941)
X-Git-Tag: release/2.6.0~467^2~13
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=ef14d28751d8db12d45f05cb6f162fe1c5bfa4f2;p=debbugs.git

Only send out control help when control is mailed (closes: #499941)
---

diff --git a/debian/changelog b/debian/changelog
index ed19665..5a9bd17 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -231,6 +231,7 @@ debbugs (2.4.2) UNRELEASED; urgency=low
   * Clean up links when there is no information about a package
     (closes: #452905)
   * Deal properly with leading spaces in query arguments (closes: #158375)
+  * Only send out control help when control is mailed (closes: #499941)
 
   
  -- Colin Watson <cjwatson@debian.org>  Fri, 20 Jun 2003 18:57:25 +0100
diff --git a/scripts/service b/scripts/service
index 335c71e..a642aab 100755
--- a/scripts/service
+++ b/scripts/service
@@ -1529,9 +1529,12 @@ sub message_body_template{
 }
 
 sub sendhelp {
-        &sendtxthelpraw("bug-log-mailserver.txt","instructions for request\@$gEmailDomain");
-        &sendtxthelpraw("bug-maint-mailcontrol.txt","instructions for control\@$gEmailDomain")
-            if $control;
+     if ($control) {
+	  &sendtxthelpraw("bug-maint-mailcontrol.txt","instructions for control\@$gEmailDomain")
+     }
+     else {
+	  &sendtxthelpraw("bug-log-mailserver.txt","instructions for request\@$gEmailDomain");
+     }
 }
 
 #sub unimplemented {