------------------------------------------------------------
revno: 854
committer: Debian BTS <[EMAIL PROTECTED]>
branch nick: mainline
timestamp: Mon 2008-05-12 02:50:21 +0000
message:
* merge don source branch changes
------------------------------------------------------------
revno: 738.1.351
merged: [EMAIL PROTECTED]
committer: Don Armstrong <[EMAIL PROTECTED]>
branch nick: source
timestamp: Sun 2008-05-11 19:22:02 -0700
message:
* Properly handle \n line terminated emails
------------------------------------------------------------
revno: 738.1.350
merged: [EMAIL PROTECTED]
committer: Don Armstrong <[EMAIL PROTECTED]>
branch nick: source
timestamp: Sun 2008-05-11 19:21:47 -0700
message:
* fix chomp wrongness
------------------------------------------------------------
revno: 738.1.349
merged: [EMAIL PROTECTED]
committer: Don Armstrong <[EMAIL PROTECTED]>
branch nick: source
timestamp: Sat 2008-05-10 18:14:09 -0700
message:
Distinguish between reports and followups (closes: #459866)
------------------------------------------------------------
revno: 738.1.348
merged: [EMAIL PROTECTED]
committer: Don Armstrong <[EMAIL PROTECTED]>
branch nick: source
timestamp: Sat 2008-05-10 16:54:52 -0700
message:
* Remove break which broke the div style adjustment
------------------------------------------------------------
revno: 738.1.347
merged: [EMAIL PROTECTED]
committer: Don Armstrong <[EMAIL PROTECTED]>
branch nick: source
timestamp: Sat 2008-05-10 16:51:55 -0700
message:
* fix issue with useless \@ escape
=== modified file 'cgi/bugreport.cgi'
--- cgi/bugreport.cgi 2008-04-26 08:50:08 +0000
+++ cgi/bugreport.cgi 2008-05-12 02:50:07 +0000
@@ -616,7 +616,6 @@
if (allDivs[i].className == "infmessage")
{
allDivs[i].style.display=(allDivs[i].style.display ==
'none' | allDivs[i].style.display == '') ? 'block' : 'none';
- break;
}
}
}
=== modified file 'debian/changelog'
--- debian/changelog 2008-04-26 08:50:08 +0000
+++ debian/changelog 2008-05-12 02:50:07 +0000
@@ -213,6 +213,7 @@
- Add the ability to return source/package mapping
(closes: #465332,#458822)
- Deal properly with \r line endings (closes: #467190)
+ - Distinguish between reports and followups (closes: #459866)
-- Colin Watson <[EMAIL PROTECTED]> Fri, 20 Jun 2003 18:57:25 +0100
=== modified file 'scripts/process.in'
--- scripts/process.in 2008-04-26 08:50:15 +0000
+++ scripts/process.in 2008-05-12 02:50:07 +0000
@@ -9,6 +9,8 @@
use POSIX qw(strftime);
+use IO::File;
+
use MIME::Parser;
use Debbugs::MIME qw(decode_rfc1522 create_mime_message getmailbody);
use Debbugs::Mail qw(send_mail_message encode_headers);
@@ -102,8 +104,8 @@
chomp @headerlines;
my $entity_body = getmailbody($entity);
- @bodylines = $entity_body ? $entity_body->as_lines() : ();
- chomp @bodylines;
+ @bodylines = map {s/\r?\n$//; $_;}
+ $entity_body ? $entity_body->as_lines() : ();
# set $i to beginning of encoded body data, so we can dump it out
# verbatim later
@@ -468,8 +470,8 @@
&finish;
}
-if ($ref<0) {
- if ($codeletter eq 'U') {
+if ($ref<0) { # new bug report
+ if ($codeletter eq 'U') { # -submitter
&htmllog("Warning","sent",$replyto,"Message not forwarded.");
&sendmessage(create_mime_message(
[From => "$gMaintainerEmail ($gProject $gBug Tracking
System)",
@@ -707,7 +709,7 @@
$resentcc= "Resent-CC: $resentccval\n";
}
-if ($codeletter eq 'U') {
+if ($codeletter eq 'U') { # sent to -submitter
&htmllog("Message", "sent on", $data->{originator}, "$gBug#$ref.");
&sendmessage(<<END,[$data->{originator},@resentccs],[EMAIL PROTECTED]);
Subject: $gBug#$ref: $newsubject
@@ -722,6 +724,7 @@
${source_pr_header}$fwd
END
} elsif ($codeletter eq 'B') { # Sent to submit
+ my $report_followup = $newref ? 'report' : 'followup';
&htmllog($newref ? "Report" : "Information", "forwarded",
join(', ',"[EMAIL PROTECTED]",@resentccs),
"<code>$gBug#$ref</code>".
@@ -735,7 +738,7 @@
${resentcc}Resent-Date: $tdate
Resent-Message-ID: <[EMAIL PROTECTED]>
Resent-Sender: $gMaintainerEmail
-X-$gProject-PR-Message: report $ref
+X-$gProject-PR-Message: $report_followup $ref
X-$gProject-PR-Package: $data->{package}
X-$gProject-PR-Keywords: $data->{keywords}
${source_pr_header}$fwd
@@ -744,6 +747,7 @@
# D and F done far earlier; B just done - so this must be M or Q
# We preserve whichever it was in the Reply-To (possibly adding
# the $gBug#).
+ my $report_followup = $newref ? 'report' : 'followup';
if (@resentccs) {
&htmllog($newref ? "Report" : "Information", "forwarded",
$resentccval,
@@ -765,7 +769,7 @@
Resent-Date: $tdate
Resent-Message-ID: <[EMAIL PROTECTED]>
Resent-Sender: $gMaintainerEmail
-X-$gProject-PR-Message: report $ref
+X-$gProject-PR-Message: $report_followup $ref
X-$gProject-PR-Package: $data->{package}
X-$gProject-PR-Keywords: $data->{keywords}
${source_pr_header}$fwd
@@ -1128,7 +1132,7 @@
# the mailing list
my ($bug_number) = $bug_fn =~ /^L(\d+)\./;
my ($bfound, $data)= lockreadbugmerge($bug_number);
- my $bug_fh = new IO::File "incoming/P$bug_fn" or die "Unable to open
incoming/P$bug_fn $!";
+ my $bug_fh = IO::File->new("incoming/P$bug_fn",'r') or die "Unable to
open incoming/P$bug_fn $!";
local $/ = undef;
my $bug_message = <$bug_fh>;
=== modified file 'scripts/service.in'
--- scripts/service.in 2008-04-26 08:50:15 +0000
+++ scripts/service.in 2008-05-12 02:50:07 +0000
@@ -66,7 +66,7 @@
@{$entity->head->header};
my $entity_body = getmailbody($entity);
- @bodylines = map {s/\r\n$//; $_;}
+ @bodylines = map {s/\r?\n$//; $_;}
$entity_body ? $entity_body->as_lines() : ();
} else {
# Legacy pre-MIME code, kept around in case MIME::Parser fails.
=== modified file 'templates/en_US/mail/process_no_package.tmpl'
--- templates/en_US/mail/process_no_package.tmpl 2008-04-26 08:50:10
+0000
+++ templates/en_US/mail/process_no_package.tmpl 2008-05-12 02:50:07
+0000
@@ -4,7 +4,7 @@
otherwise ignored.
This makes it much harder for us to categorise and deal with your
-problem report. Please _resubmit_ your report to [EMAIL PROTECTED]
+problem report. Please _resubmit_ your report to [EMAIL PROTECTED]
and tell us which package the report is on. For help, check out
http://{$config{web_domain}}/Reporting{$config{html_suffix}}.
