------------------------------------------------------------
revno: 926
committer: Debian BTS <debb...@rietz>
branch nick: debian
timestamp: Mon 2009-08-17 20:23:04 +0000
message:
merge changes from dla source
------------------------------------------------------------
revno: 721.14.164
committer: Don Armstrong <d...@donarmstrong.com>
branch nick: source
timestamp: Mon 2009-08-17 13:21:38 -0700
message:
dont depend on build in test; this is wrong, but temporary
------------------------------------------------------------
revno: 721.14.163
committer: Don Armstrong <d...@donarmstrong.com>
branch nick: source
timestamp: Mon 2009-08-17 13:21:19 -0700
message:
use xloop everywhere, and do not ditch old values
------------------------------------------------------------
revno: 721.14.162
committer: Don Armstrong <d...@donarmstrong.com>
branch nick: source
timestamp: Mon 2009-08-17 13:20:59 -0700
message:
run tests by default
------------------------------------------------------------
revno: 721.14.161
committer: Don Armstrong <d...@donarmstrong.com>
branch nick: source
timestamp: Mon 2009-08-17 13:20:20 -0700
message:
add missing dependencies
------------------------------------------------------------
revno: 721.14.160
committer: Don Armstrong <d...@donarmstrong.com>
branch nick: source
timestamp: Mon 2009-08-17 13:20:01 -0700
message:
warn if there isn't a configuration file, but continue
------------------------------------------------------------
revno: 721.14.159
committer: Don Armstrong <d...@donarmstrong.com>
branch nick: source
timestamp: Sat 2009-08-15 18:18:39 -0700
message:
bump control; no changes
=== modified file 'Debbugs/Config.pm'
--- Debbugs/Config.pm 2009-08-15 23:26:48 +0000
+++ Debbugs/Config.pm 2009-08-17 20:23:02 +0000
@@ -991,6 +991,10 @@
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: $!";
=== modified file 'Makefile'
--- Makefile 2009-07-21 20:36:41 +0000
+++ Makefile 2009-08-17 20:23:02 +0000
@@ -31,7 +31,7 @@
$(PERL) Makefile.PL
$(MAKE) -f Makefile.perl
-test: build
+test:
$(PERL) -MTest::Harness -I. -e 'runtests(glob(q(t/*.t)))'
clean:
=== modified file 'debian/control'
--- debian/control 2009-07-26 12:51:27 +0000
+++ debian/control 2009-08-17 20:23:02 +0000
@@ -3,14 +3,15 @@
Priority: extra
Maintainer: Debbugs developers <debian-debb...@lists.debian.org>
Uploaders: Colin Watson <cjwat...@debian.org>, Don Armstrong <d...@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 @@
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
=== modified file 'debian/rules'
--- debian/rules 2009-08-07 02:36:26 +0000
+++ debian/rules 2009-08-17 20:23:02 +0000
@@ -15,7 +15,7 @@
# Call the test suite
$(PERL) Makefile.PL INSTALLDIRS=vendor
$(MAKE) -f Makefile.perl
-# $(MAKE) test
+ $(MAKE) test
touch $@
clean:
=== modified file 'scripts/process'
--- scripts/process 2009-08-11 05:45:53 +0000
+++ scripts/process 2009-08-17 20:23:02 +0000
@@ -129,6 +129,7 @@
my %header;
+my @common_headers;
for my $hdr (@headerlines) {
$hdr = decode_rfc1522($hdr);
$_ = $hdr;
@@ -140,6 +141,9 @@
# 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 @@
}
$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 @@
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 @@
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 '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 @@
} 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 @@
&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 ($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.nonumnos...@$gemaildomain>",
@@ -510,7 +519,7 @@
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 @@
$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-qui...@$gemaildomain
${orgsender}Resent-To: $data->{originator}
-${resentcc}Resent-Date: $tdate
+${resentcc}${common_headers}Resent-Date: $tdate
Resent-Message-ID: <handler.$ref.$...@$gemaildomain>
Resent-Sender: $gMaintainerEmail
X-$gProject-PR-Message: report $ref
@@ -736,7 +750,7 @@
Reply-To: $replyto, $r...@$gemaildomain
Resent-From: $header{'from'}
${orgsender}Resent-To: $gsubmitli...@$glistdomain
-${resentcc}Resent-Date: $tdate
+${resentcc}${common_headers}Resent-Date: $tdate
Resent-Message-ID: <handler.$ref.$...@$gemaildomain>
Resent-Sender: $gMaintainerEmail
X-$gProject-PR-Message: $report_followup $ref
@@ -770,7 +784,7 @@
Resent-Date: $tdate
Resent-Message-ID: <handler.$ref.$...@$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 @@
}
);
&sendmessage(create_mime_message(
- ["X-Loop" => "$gMaintainerEmail",
+ [...@common_headers,
From => "$gMaintainerEmail ($gProject $gBug
Tracking System)",
To => $replyto,
Subject => $t_h{subject},
