[project @ 2003-07-16 10:08:04 by cjwatson]

Add support for an X-Debbugs-No-Ack: mail header to suppress
acknowledgements.

diff --git a/debian/changelog b/debian/changelog
index d6327c47275b426b0996ad318f0e84f36ff14a66..2fc24fb1ffb5a913d45e85d284683549ed53809b 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ debbugs (2.4.2) UNRELEASED; urgency=low
   * Colin Watson:
     - Add (slightly) fancy CGI decoding of message/* MIME types.
     - CGI scripts now support multiple maintainers for a single package.
+    - Add support for an X-Debbugs-No-Ack: mail header to suppress
+      acknowledgements.
 
  -- Colin Watson <cjwatson@debian.org>  Fri, 20 Jun 2003 18:57:25 +0100
 

diff --git a/html/Reporting.html.in b/html/Reporting.html.in
index 30ced9575fdfc3c9320b346810caea8202394a6d..bba28d62ef3cd536fa8106a91e815f23b6435b5a 100644 (file)
--- a/html/Reporting.html.in
+++ b/html/Reporting.html.in
@@ -225,6 +225,23 @@ only a summary).
 any forwarded message so that replies will by default be processed in
 the same way as the original report.
 
+
+<h2>Acknowledgements</h2>
+
+<p>Normally, the $gBug system will return an acknowledgement to you by
+e-mail when you report a new bug or submit additional information to an
+existing bug. If you want to suppress this acknowledgement, include an
+<code>X-Debbugs-No-Ack</code> header in your e-mail (the contents of this
+header do not matter; however, it must be in the mail header and
+<em>not</em> in the pseudo-header with the <code>Package</code> field). If
+you report a new $gBug with this header, you will need to check the web
+interface yourself to find the $gBug number.</p>
+
+<p>Note that this header will not suppress acknowledgements from the
+<code>control\@$gEmailDomain</code> mailserver, since those acknowledgements
+may contain error messages which should be read and acted upon.</p>
+
+
 <h3>$gBug reports against unknown packages</h3>
 
 <p>If the $gBug tracking system doesn't know who the maintainer of the

diff --git a/scripts/process.in b/scripts/process.in
index 2d31c99d891cfbeebf29af5247f388253035444e..05f238083359517836422e76405b573e9df820aa 100755 (executable)
--- a/scripts/process.in
+++ b/scripts/process.in
@@ -1,5 +1,5 @@
 #!/usr/bin/perl
-# $Id: process.in,v 1.72 2003/06/23 11:23:35 cjwatson Exp $
+# $Id: process.in,v 1.73 2003/07/16 10:08:04 cjwatson Exp $
 #
 # Usage: process nn
 # Temps:  incoming/Pnn
@@ -102,7 +102,7 @@ for my $hdr (@headerlines) {
     s/\n\s/ /g;
     &finish if m/^x-loop: (\S+)$/i && $1 eq "$gMaintainerEmail";
     my $ins = !m/^subject:/i && !m/^reply-to:/i && !m/^return-path:/i
-           && !m/^From / && !m/^X-Debbugs-CC:/i;
+           && !m/^From / && !m/^X-Debbugs-/i;
     $fwd .= $hdr."\n" if $ins;
     # print DEBUG ">$_<\n";
     if (s/^(\S+):\s*//) {
@@ -702,12 +702,13 @@ if (length($resentccval)) {
     $htmlbreak = "  Copy sent to <code>".&sani($resentccval)."</code>.".
         $htmlbreak;
 }
-if ($newref) {
-    &htmllog("Acknowledgement","sent",$replyto,
-             ($veryquiet ?
-              "New $gBug report received and filed, but not forwarded." :
-              "New $gBug report received and forwarded."). $htmlbreak);
-    &sendmessage($veryquiet ? <<END : $codeletter eq 'M' ? <<END : <<END,'');
+unless (exists $header{'x-debbugs-no-ack'}) {
+    if ($newref) {
+        &htmllog("Acknowledgement","sent",$replyto,
+                 ($veryquiet ?
+                  "New $gBug report received and filed, but not forwarded." :
+                  "New $gBug report received and forwarded."). $htmlbreak);
+        &sendmessage($veryquiet ? <<END : $codeletter eq 'M' ? <<END : <<END,'');
 From: $gMaintainerEmail ($gProject $gBug Tracking System)
 To: $replyto
 Subject: $gBug#$ref: Acknowledgement of QUIET report
@@ -793,13 +794,13 @@ $brokenness
 $gMaintainer
 (administrator, $gProject $gBugs database)
 END
-} elsif ($codeletter ne 'U' and
-         $header{'precedence'} !~ /\b(?:bulk|junk|list)\b/) {
-    &htmllog("Acknowledgement","sent",$replyto,
-             ($veryquiet ? "Extra info received and filed, but not forwarded." :
-              $codeletter eq 'M' ? "Extra info received and forwarded to maintainer." :
-              "Extra info received and forwarded to list."). $htmlbreak);
-    &sendmessage($veryquiet ? <<END : $codeletter eq 'M' ? <<END : <<END,'');
+    } elsif ($codeletter ne 'U' and
+             $header{'precedence'} !~ /\b(?:bulk|junk|list)\b/) {
+        &htmllog("Acknowledgement","sent",$replyto,
+                 ($veryquiet ? "Extra info received and filed, but not forwarded." :
+                  $codeletter eq 'M' ? "Extra info received and forwarded to maintainer." :
+                  "Extra info received and forwarded to list."). $htmlbreak);
+        &sendmessage($veryquiet ? <<END : $codeletter eq 'M' ? <<END : <<END,'');
 From: $gMaintainerEmail ($gProject $gBug Tracking System)
 To: $replyto
 Subject: $gBug#$ref: Info received and FILED only
@@ -879,6 +880,7 @@ $brokenness
 $gMaintainer
 (administrator, $gProject $gBugs database)
 END
+    }
 }
 
 &appendlog;