From: Don Armstrong <don@donarmstrong.com>
Date: Tue, 4 May 2010 02:27:38 +0000 (-0700)
Subject: Add urls to control@ mail footer (Closes: #578822). Thanks to Lars
X-Git-Tag: release/2.6.0~417^2~2
X-Git-Url: https://git.donarmstrong.com/?p=debbugs.git;a=commitdiff_plain;h=717460380c89fb9c15c463d1715856146e62a1d7

Add urls to control@ mail footer (Closes: #578822). Thanks to Lars
Wirzenius
---

diff --git a/debian/changelog b/debian/changelog
index 6e0d97a..c32e565 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -25,6 +25,8 @@ debbugs (2.4.2~exp1) experimental; urgency=low
   * Fix noaffects option
   * Allow the default sendmail options to be specified in the config file;
     don't use -obq by default anymore.
+  * Add urls to control@ mail footer (Closes: #578822). Thanks to Lars
+    Wirzenius
 
  -- Don Armstrong <don@debian.org>  Wed, 26 Aug 2009 21:32:53 -0700
 
diff --git a/scripts/service b/scripts/service
index 0abe271..89ff785 100755
--- a/scripts/service
+++ b/scripts/service
@@ -1301,13 +1301,12 @@ References: $header{'message-id'}
 Message-ID: <handler.s.$nn.transcript\@$gEmailDomain>
 Precedence: bulk
 ${packagepr}X-$gProject-PR-Message: transcript
-
-${transcript_scalar}Please contact me if you need assistance.
-
-$gMaintainer
-(administrator, $gProject $gBugs database)
 END
 
+$reply .= fill_template('mail/message_body',
+			  {body => "${transcript_scalar}Please contact me if you need assistance."},
+			);
+
 my $repliedshow= join(', ',$replyto,
 		      determine_recipients(recipients => \%recipients,
 					   cc => 1,
@@ -1354,12 +1353,15 @@ sub fill_template{
      my $variables = {config => \%config,
 		      defined($ref)?(ref    => $ref):(),
 		      defined($data)?(data  => $data):(),
+		      refs => [keys %bug_affected],
 		      %{$extra_var},
 		     };
      my $hole_var = {'&bugurl' =>
 		     sub{"$_[0]: ".
 			      'http://'.$config{cgi_domain}.'/'.
-				   Debbugs::CGI::bug_url($_[0]);
+				   Debbugs::CGI::bug_links(bug=>$_[0],
+							   links_only => 1,
+							  );
 		    }
 		    };
      return fill_in_template(template => $template,