X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scripts%2Fprocess;h=95d933d7a1caa67e76a3a0d74091a693ea010144;hb=9056bf9dbbff4dda558b50bfb8da3091a4f30570;hp=bceb69cb186b4198267ad24014e67bd11b75d9bc;hpb=c04432ba467f7f957835b7264157951787e27f4c;p=debbugs.git

diff --git a/scripts/process b/scripts/process
index bceb69c..95d933d 100755
--- a/scripts/process
+++ b/scripts/process
@@ -228,6 +228,8 @@ for my $phline (@bodylines)
     last if $phline !~ m/^([\w-]+):\s*(\S.*)/;
     my ($fn, $fv) = ($1, $2);
     $fv =~ s/\s*$//;
+    # pluralize tag/usertag
+    $fn = $fn.'s' if $fn =~ /^(?:tag|usertag)$/;
     print {$debugfh} ">$fn|$fv|\n";
     $fn = lc $fn;
     if ($fn =~ /^control$/) {
@@ -501,6 +503,8 @@ if ($codeletter eq 'D' || $codeletter eq 'F')
               "X-$gProject-PR-Keywords" => $data->{keywords},
 	      # Only have a X-$gProject-PR-Source when we know the source package
 	      (defined($source_package) and length($source_package))?("X-$gProject-PR-Source" => $source_package):(),
+              "Reply-To"                => "$ref\@$gEmailDomain",
+              "Content-Type"            => 'text/plain; charset="utf-8"',
              ],message_body_template('mail/process_mark_as_forwarded',
 				     {date => $header{date},
 				      messageid => $header{'message-id'},
@@ -524,6 +528,8 @@ if ($codeletter eq 'D' || $codeletter eq 'F')
               "X-$gProject-PR-Keywords" => $data->{keywords},
 	      # Only have a X-$gProject-PR-Source when we know the source package
 	      (defined($source_package) and length($source_package))?("X-$gProject-PR-Source" => $source_package):(),
+              "Reply-To"                => "$ref\@$gEmailDomain",
+              "Content-Type"            => 'text/plain; charset="utf-8"',
              ],message_body_template('mail/process_mark_as_done',
 				     {date => $header{date},
 				      messageid => $header{'message-id'},
@@ -592,7 +598,8 @@ if ($ref<0) { # new bug report
 
     if (defined $pheader{source}) {
 	# source packages are identified by the src: prefix
-        $data->{package} = 'src:'.$pheader{source};
+        $data->{package} = $pheader{source};
+        $data->{package} =~ s/(^|,\s*)/${1}src:/g;
     } elsif (defined $pheader{package}) {
         $data->{package} = $pheader{package};
 	if ($data->{package} =~ /^src:(.+)/) {
@@ -1015,7 +1022,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 +1077,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)",
@@ -1261,7 +1268,7 @@ sub fill_template{
 		     };
      my $hole_var = {'&bugurl' =>
 		     sub{"$_[0]: ".
-			      'http://'.$config{cgi_domain}.'/'.
+			      $config{cgi_domain}.'/'.
 				   Debbugs::CGI::bug_links(bug=>$_[0],
 							   links_only => 1,
 							  );