From: Don Armstrong <don@archimedes>
Date: Thu, 8 Mar 2007 01:05:15 +0000 (-0800)
Subject: fix mbox handling
X-Git-Tag: release/2.6.0~584^2~1
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=cd5d5ec89a2b071fc85e46b66fe6577020bac6db;p=debbugs.git

fix mbox handling
---

diff --git a/cgi/bugreport.cgi b/cgi/bugreport.cgi
index 01f6934..0d8e31e 100755
--- a/cgi/bugreport.cgi
+++ b/cgi/bugreport.cgi
@@ -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 ];