should be Return-path, not Return-Path

[debbugs.git] / bin / debbugs-spam

diff --git a/bin/debbugs-spam b/bin/debbugs-spam
index be1ab24765db5aafd472b02921f2b012fe37b612..5dca08edf01de69653388521c21f3c4aa6e6d785 100755 (executable)
--- a/bin/debbugs-spam
+++ b/bin/debbugs-spam
@@ -346,8 +346,8 @@ sub add_return_path {
     ## ", and doesn't have a Return-Path. Fix that up so spamassassin
     ## is happy.
     $message =~
-        s{^(Received: at \S+\ by \S+;[^\n]+\n)(From (\S+) [^\n]+\n)}
-        {${1}Return-Path: $3\n$2};
+        s{^(Received: \(at \S+\) by \S+;[^\n]+\n)(From (\S+) [^\n]+\n)}
+        {${2}Return-path: $3\n$1};
     return $message;
 }
 
@@ -422,8 +422,7 @@ sub foreachmsg {
         die "Unable to open bug log for $bug_num";
     my %seen_msgids;
     while (my $record = $log->read_record()) {
-        next if $record->{type} eq 'html';
-        next if $record->{type} eq 'autocheck';
+        next unless $record->{type} eq 'incoming-recv';
         my ($msg_id) = record_regex($record,
                                     qr/^Message-Id:\s+<(.+)>/mi);
         next unless defined $msg_id;