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

Wirzenius

diff --git a/debian/changelog b/debian/changelog
index 6e0d97a3be56651cedfd4a17bc8202ba375e62ba..c32e56512866facbdfe26c71109c8902bfd0fb10 100644 (file)
--- 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 0abe271d383d2c8fad0eb96eafb224220601287d..89ff785c4152234c72c62f02fb30ac9e17a755c1 100755 (executable)
--- 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,