* merge don source branch changes

diff --git a/cgi/bugreport.cgi b/cgi/bugreport.cgi
index 4c73dbbc4905a23a4910b82ce97f1d61d7a71d34..abc8dbef10be1496d80fe3c20fa53b48e556709d 100755 (executable)
--- a/cgi/bugreport.cgi
+++ b/cgi/bugreport.cgi
@@ -616,7 +616,6 @@ function toggle_infmessages()
                 if (allDivs[i].className == "infmessage")
                 {
                         allDivs[i].style.display=(allDivs[i].style.display == 'none' | allDivs[i].style.display == '') ? 'block' : 'none';
-                        break;
                 }
         }
 }

diff --git a/debian/changelog b/debian/changelog
index 60a8e3cf8e0e7fe209b064e9fa8dcffb6397a25b..339779a187a5c600272e4f42174722004aeb4173 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -213,6 +213,7 @@ debbugs (2.4.2) UNRELEASED; urgency=low
     - 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 <cjwatson@debian.org>  Fri, 20 Jun 2003 18:57:25 +0100

diff --git a/scripts/process.in b/scripts/process.in
index 2de356279e436f22939024ac0519b46567e6863d..e17127b8831e2eb61882263afb5490bde1caf1bd 100755 (executable)
--- a/scripts/process.in
+++ b/scripts/process.in
@@ -9,6 +9,8 @@ use strict;
 
 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 @@ if ($entity and $entity->head->tags) {
     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 @@ if ($codeletter eq 'D' || $codeletter eq 'F')
     &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 @@ if (length($resentccval)) {
     $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],[@bccs]);
 Subject: $gBug#$ref: $newsubject
@@ -722,6 +724,7 @@ X-$gProject-PR-Keywords: $data->{keywords}
 ${source_pr_header}$fwd
 END
 } elsif ($codeletter eq 'B') { # Sent to submit
+    my $report_followup = $newref ? 'report' : 'followup';
     &htmllog($newref ? "Report" : "Information", "forwarded",
              join(', ',"$gSubmitList\@$gListDomain",@resentccs),
              "<code>$gBug#$ref</code>".
@@ -735,7 +738,7 @@ ${orgsender}Resent-To: $gSubmitList\@$gListDomain
 ${resentcc}Resent-Date: $tdate
 Resent-Message-ID: <handler.$ref.$nn\@$gEmailDomain>
 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 @@ END
     # 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 @@ ${orgsender}Resent-To: $resentccval
 Resent-Date: $tdate
 Resent-Message-ID: <handler.$ref.$nn\@$gEmailDomain>
 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 @@ sub bug_list_forward{
      # 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>;

diff --git a/scripts/service.in b/scripts/service.in
index 1cf84601d521e8248c3db4149149cd9b6f0841ca..05925d2723cf1b56a94f07e81586bbe29c447e5a 100755 (executable)
--- a/scripts/service.in
+++ b/scripts/service.in
@@ -66,7 +66,7 @@ if ($entity and $entity->head->tags) {
         @{$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.

diff --git a/templates/en_US/mail/process_no_package.tmpl b/templates/en_US/mail/process_no_package.tmpl
index 605c96e3cdff185ede77a525358916085f782600..71dd2772970d586e15db4ec3104d779c9ed037cc 100644 (file)
--- a/templates/en_US/mail/process_no_package.tmpl
+++ b/templates/en_US/mail/process_no_package.tmpl
@@ -4,7 +4,7 @@ pseudo-header at all.  Your message has been filed under junk but
 otherwise ignored.
 
 This makes it much harder for us to categorise and deal with your
-problem report. Please _resubmit_ your report to {$baddress}\@{$config{email_domain}}
+problem report. Please _resubmit_ your report to {$baddress}@{$config{email_domain}}
 and tell us which package the report is on. For help, check out
 http://{$config{web_domain}}/Reporting{$config{html_suffix}}.