merge changes from dla source

diff --git a/Debbugs/Config.pm b/Debbugs/Config.pm
index eeea7641a4a21fea55a53fa8a28ea9f14f7d5699..b75bd0b16ec3b515a4ae4a602f8acd3f52964f04 100644 (file)
--- a/Debbugs/Config.pm
+++ b/Debbugs/Config.pm
@@ -991,6 +991,10 @@ set_default(\%config,'html_expire_note',
 
 sub read_config{
      my ($conf_file) = @_;
+     if (not -e $conf_file) {
+        print STDERR "configuration file '$conf_file' doesn't exist; skipping it";
+        return;
+     }
      # first, figure out what type of file we're reading in.
      my $fh = new IO::File $conf_file,'r'
          or die "Unable to open configuration file $conf_file for reading: $!";

diff --git a/Makefile b/Makefile
index df174b82fef57881c5de12f59308b095ec0e1303..e92a5f603d8e31a27c6106252e2691196b202486 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -31,7 +31,7 @@ build:
        $(PERL) Makefile.PL
        $(MAKE) -f Makefile.perl
 
-test: build
+test:
        $(PERL) -MTest::Harness -I. -e 'runtests(glob(q(t/*.t)))'
 
 clean:

diff --git a/debian/control b/debian/control
index 0716ee5a3a3ab4e2406600b04d6d1dc039129e24..3307a3e1611cdb51f9750c506c0f7638e9a6102a 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -3,14 +3,15 @@ Section: misc
 Priority: extra
 Maintainer: Debbugs developers <debian-debbugs@lists.debian.org>
 Uploaders: Colin Watson <cjwatson@debian.org>, Don Armstrong <don@debian.org>
-Standards-Version: 3.8.1
+Standards-Version: 3.8.2
 Build-Depends: debhelper (>= 5)
 Build-Depends-Indep: libparams-validate-perl,
  libmailtools-perl, libmime-tools-perl, libio-stringy-perl, libmldbm-perl,
  liburi-perl, libsoap-lite-perl, libcgi-simple-perl,
  libhttp-server-simple-perl, libtest-www-mechanize-perl,
  libmail-rfc822-address-perl, libsafe-hole-perl, libuser-perl,
- libconfig-simple-perl, libtest-pod-perl
+ libconfig-simple-perl, libtest-pod-perl, liblist-moreutils-perl,
+ libtext-template-perl
 
 Package: debbugs
 Architecture: all
@@ -34,7 +35,8 @@ Architecture: all
 Depends: ${perl:Depends}, libmailtools-perl, ed, libmime-tools-perl,
  libio-stringy-perl, libmldbm-perl, liburi-perl, libsoap-lite-perl,
  libcgi-simple-perl, libparams-validate-perl, libtext-template-perl,
- libsafe-hole-perl, libmail-rfc822-address-perl
+ libsafe-hole-perl, libmail-rfc822-address-perl, liblist-moreutils-perl,
+ libtext-template-perl
 Section: perl
 Description: modules used by the active Debian BTS
  Debian has a bug tracking system which files details of bugs reported by

diff --git a/debian/rules b/debian/rules
index 26f01bee11f043359713450c1c2f1e0ade59c6fc..c3483791a6757eec503f2920237f60f45e4c0eb3 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -15,7 +15,7 @@ build-stamp:
 # Call the test suite
        $(PERL) Makefile.PL INSTALLDIRS=vendor
        $(MAKE) -f Makefile.perl
-#      $(MAKE) test
+       $(MAKE) test
        touch $@
 
 clean:

diff --git a/scripts/process b/scripts/process
index 12e667b9916596345d412c0558cd954ccb5d0f1c..9cbd85c8147730b181a7488a6f0ca73b1c4f9a29 100755 (executable)
--- a/scripts/process
+++ b/scripts/process
@@ -129,6 +129,7 @@ if ($entity and $entity->head->tags) {
 
 my %header;
 
+my @common_headers;
 for my $hdr (@headerlines) {
     $hdr = decode_rfc1522($hdr);
     $_ = $hdr;
@@ -140,6 +141,9 @@ for my $hdr (@headerlines) {
     # print DEBUG ">$_<\n";
     if (s/^(\S+):\s*//) {
        my $v = lc $1;
+       if ($v eq 'x-loop') {
+           push @common_headers, 'X-Loop',$_;
+       }
        print DEBUG ">$v=$_<\n";
        $header{$v} = $_;
     } else {
@@ -148,6 +152,8 @@ for my $hdr (@headerlines) {
 }
 $header{'message-id'} = '' if not defined $header{'message-id'};
 
+push @common_headers, 'X-Loop',$gMaintainerEmail;
+
 # remove blank lines
 shift @bodylines while @bodylines and $bodylines[0] !~ /\S/;
 
@@ -236,6 +242,7 @@ if ($tryref >= 0)
           References    => join(' ',grep {defined $_} $header{'message-id'},$data->{msgid}),
           Precedence    => 'bulk',
           "X-$gProject-PR-Message" => 'error',
+          @common_headers,
          ],message_body_template('mail/process_unknown_bug_number',
                                  {subject => $subject,
                                   date    => $header{date},
@@ -327,6 +334,7 @@ if ($codeletter eq 'D' || $codeletter eq 'F')
           References    => join(' ',grep {defined $_} $header{'message-id'},$data->{msgid}),
           Precedence    => 'bulk',
           "X-$gProject-PR-Message" => 'error',
+          @common_headers,
          ],message_body_template('mail/process_no_bug_number',
                                  {subject => $subject,
                                   date    => $header{date},
@@ -397,7 +405,7 @@ if ($codeletter eq 'D' || $codeletter eq 'F')
         if ($codeletter eq 'F') {
            &htmllog("Reply","sent",$replyto,"You have marked $gBug as forwarded.");
             &sendmessage(create_mime_message(
-            ["X-Loop"      => "$gMaintainerEmail",
+            [@common_headers,
              From          => "$gMaintainerEmail ($gProject $gBug Tracking System)",
               To            => "$replyto",
               Subject       => "$gBug#$ref: marked as forwarded ($data->{subject})",
@@ -420,7 +428,7 @@ if ($codeletter eq 'D' || $codeletter eq 'F')
         } else {
            &htmllog("Reply","sent",$replyto,"You have taken responsibility.");
             &sendmessage(create_mime_message(
-            ["X-Loop"      => "$gMaintainerEmail",
+            [@common_headers,
              From          => "$gMaintainerEmail ($gProject $gBug Tracking System)",
               To            => $replyto,
               Subject       => "$gBug#$ref: marked as done ($data->{subject})",
@@ -444,7 +452,7 @@ if ($codeletter eq 'D' || $codeletter eq 'F')
             &htmllog("Notification","sent",$data->{originator},
                "$gBug acknowledged by developer.");
             &sendmessage(create_mime_message(
-            ["X-Loop"      => "$gMaintainerEmail",
+            [@common_headers,
              From          => "$gMaintainerEmail ($gProject $gBug Tracking System)",
               To            => "$data->{originator}",
               Subject       => "$gBug#$ref closed by $markedby ($header{'subject'})",
@@ -475,7 +483,8 @@ if ($codeletter eq 'D' || $codeletter eq 'F')
 if ($ref<0) { # new bug report
     if ($codeletter eq 'U') { # -submitter
        &sendmessage(create_mime_message(
-          [From          => "$gMaintainerEmail ($gProject $gBug Tracking System)",
+          [@common_headers,
+          From          => "$gMaintainerEmail ($gProject $gBug Tracking System)",
           To            => $replyto,
           Subject       => "Message with no $gBug number cannot be sent to submitter! ($subject)",
           'Message-ID'  => "<handler.x.$nn.nonumnosub\@$gEmailDomain>",
@@ -510,7 +519,7 @@ if ($ref<0) { # new bug report
        my $body = message_body_template('mail/process_no_package',
                                        );
         &sendmessage(create_mime_message(
-                       ["X-Loop"      => "$gMaintainerEmail",
+                       [@common_headers,
                        From          => "$gMaintainerEmail ($gProject $gBug Tracking System)",
                         To            => $replyto,
                         Subject       => "Message with no Package: tag cannot be processed! ($subject)",
@@ -710,13 +719,18 @@ if (length($resentccval)) {
     $resentcc= "Resent-CC: $resentccval\n"; 
 }
 
+my $common_headers='';
+{
+    local $a = 0;
+    $common_headers=map {$_.($a++%2?': ':"\n")} @common_headers;
+}
 if ($codeletter eq 'U') { # sent to -submitter
     &htmllog("Message", "sent on", $data->{originator}, "$gBug#$ref.");
     &sendmessage(<<END,[$data->{originator},@resentccs],[@bccs]);
 Subject: $gBug#$ref: $newsubject
 Reply-To: $replyto, $ref-quiet\@$gEmailDomain
 ${orgsender}Resent-To: $data->{originator}
-${resentcc}Resent-Date: $tdate
+${resentcc}${common_headers}Resent-Date: $tdate
 Resent-Message-ID: <handler.$ref.$nn\@$gEmailDomain>
 Resent-Sender: $gMaintainerEmail
 X-$gProject-PR-Message: report $ref
@@ -736,7 +750,7 @@ Subject: $gBug#$ref: $newsubject
 Reply-To: $replyto, $ref\@$gEmailDomain
 Resent-From: $header{'from'}
 ${orgsender}Resent-To: $gSubmitList\@$gListDomain
-${resentcc}Resent-Date: $tdate
+${resentcc}${common_headers}Resent-Date: $tdate
 Resent-Message-ID: <handler.$ref.$nn\@$gEmailDomain>
 Resent-Sender: $gMaintainerEmail
 X-$gProject-PR-Message: $report_followup $ref
@@ -770,7 +784,7 @@ ${orgsender}Resent-To: $resentccval
 Resent-Date: $tdate
 Resent-Message-ID: <handler.$ref.$nn\@$gEmailDomain>
 Resent-Sender: $gMaintainerEmail
-X-$gProject-PR-Message: $report_followup $ref
+${common_headers}X-$gProject-PR-Message: $report_followup $ref
 X-$gProject-PR-Package: $data->{package}
 X-$gProject-PR-Keywords: $data->{keywords}
 ${source_pr_header}$fwd
@@ -863,7 +877,7 @@ if (not exists $header{'x-debbugs-no-ack'} and
                                      }
                                     );
      &sendmessage(create_mime_message(
-                      ["X-Loop"      => "$gMaintainerEmail",
+                      [@common_headers,
                        From          => "$gMaintainerEmail ($gProject $gBug Tracking System)",
                        To            => $replyto,
                        Subject       => $t_h{subject},