merge changes from dla source tree

[debbugs.git] / cgi / bugreport.cgi

diff --git a/cgi/bugreport.cgi b/cgi/bugreport.cgi
index bdca6122a685aee07795ad7bc8a6401fe93f0ef3..0d8e31e56cde45dcae4aa2f73784bfc1e6ad8699 100755 (executable)
--- a/cgi/bugreport.cgi
+++ b/cgi/bugreport.cgi
@@ -14,7 +14,7 @@ use Debbugs::Config qw(:globals :text);
 use Debbugs::Log;
 use Debbugs::MIME qw(convert_to_utf8 decode_rfc1522 create_mime_message);
 use Debbugs::CGI qw(:url :html :util);
-use Debbugs::Common qw(buglog);
+use Debbugs::Common qw(buglog getmaintainers);
 use Debbugs::Packages qw(getpkgsrc);
 use Debbugs::Status qw(splitpackages get_bug_status isstrongseverity);
 
@@ -537,9 +537,9 @@ END
          my ($msg_id) = $record->{text} =~ /^Message-Id:\s+<(.+)>/im;
          next if exists $seen_message_ids{$msg_id};
          $seen_message_ids{$msg_id} = 1;
-         next if $msg_id =~/handler\..+\.ack(?:info)?\@/;
-         $record_wanted_anyway = 1 if $record->{text} =~ /^Received: \(at control\)/;
-         next if not $boring and $record->{type} ne $wanted_type and not $record_wanted_anyway and @records > 1;
+         next if $msg_id =~/handler\..+\.ack(?:info|done)?\@/;
+         $record_wanted_anyway = 1 if $record->{text} =~ /^Received: \(at control|submit\)/;
+         next if not $boring and not $record->{type} eq $wanted_type and not $record_wanted_anyway and @records > 1;
          my @lines = split( "\n", $record->{text}, -1 );
          if ( $lines[ 1 ] =~ m/^From / ) {
               my $tmp = $lines[ 0 ];