X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scripts%2Fprocess;h=2f4341c7a60c115a01d8075049e07f975fbd05c0;hb=4118f90e5b711616eeff28aef36615b0a892b57f;hp=516bd314505089aee2e1ae84360714dbdd746efb;hpb=4a71b4c56f1bb4bfc9fb3fc7915511ea4a557800;p=debbugs.git

diff --git a/scripts/process b/scripts/process
index 516bd31..2f4341c 100755
--- a/scripts/process
+++ b/scripts/process
@@ -248,7 +248,7 @@ for my $key (grep /X-Debbugs-.*/i, keys %pheader) {
 # set $i to beginning of encoded body data, so we can dump it out
 # verbatim later
 my $i = 0;
-++$i while $msg[$i] =~ /./;
+++$i while $i <= $#msg and $msg[$i] =~ /./;
 $fwd .= join("\n",@msg[$i..$#msg]);
 
 binmode($debugfh,':raw');
@@ -1015,7 +1015,7 @@ if (@control_bits) {
 	 request_subject   => $header{subject},
 	 request_nn        => $nn,
 	 request_replyto   => $replyto,
-	 message           => $msg,
+	 message           => [$msg],
 	 affected_bugs     => \%bug_affected,
 	 affected_packages => \%affected_packages,
 	 recipients        => \%recipients,
@@ -1070,7 +1070,7 @@ if (@control_bits) {
 					address_only => 1,
 					cc => 1,
 				       );
-    my $error_text = $errors > 0 ? " (with $errors errors)":'';
+    my $error_text = $errors > 0 ? " (with $errors error" . ($errors > 1 ? "s" : "") . ")" : "";
     my $reply =
 	create_mime_message(['X-Loop'      => $gMaintainerEmail,
 			     From          => "$gMaintainerEmail ($gProject $gBug Tracking System)",