X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scripts%2Fservice;h=7e4c2054bcf618b4ec4eb204dbc01d300183d203;hb=01c360c8831df87a69fe1f49a08dda22ded51950;hp=c62e3d59e7c632d1457dbf26fd4dce8831ddd146;hpb=07128905acc67b85d91ab2070dc172ac0152905f;p=debbugs.git

diff --git a/scripts/service b/scripts/service
index c62e3d5..7e4c205 100755
--- a/scripts/service
+++ b/scripts/service
@@ -39,7 +39,7 @@ use Debbugs::Text qw(:templates);
 
 use Scalar::Util qw(looks_like_number);
 
-use List::AllUtils qw(first);
+use List::AllUtils qw(first uniqnum);
 
 use Mail::RFC822::Address;
 use Encode qw(decode encode);
@@ -518,7 +518,7 @@ eval{
     $temp_transcript = decode("utf8",$temp_transcript,Encode::FB_CROAK);
 };
 my $reply =
-    create_mime_message([From          => "$gMaintainerEmail ($gProject $gBug Tracking System)",
+    create_mime_message([From          => qq("$gProject $gBug Tracking System" <$gMaintainerEmail>),
 			 To            => $replyto,
 			 @maintccs ? (Cc => join(', ',@maintccs)):(),
 			 Subject       => "Processed${error_text}: $header{subject}",
@@ -573,20 +573,15 @@ sub fill_template{
      my $variables = {config => \%config,
 		      defined($ref)?(ref    => $ref):(),
 		      defined($data)?(data  => $data):(),
-		      refs => [map {exists $clonebugs{$_}?$clonebugs{$_}:$_} keys %bug_affected],
+		      refs => [sort
+			       uniqnum(defined($ref)?($ref):(),
+				       map {exists $clonebugs{$_}?$clonebugs{$_}:$_}
+				       keys %bug_affected)],
 		      %{$extra_var},
 		     };
-     my $hole_var = {'&bugurl' =>
-		     sub{"$_[0]: ".
-			      $config{cgi_domain}.'/'.
-				   Debbugs::CGI::bug_links(bug=>$_[0],
-							   links_only => 1,
-							  );
-		    }
-		    };
      return fill_in_template(template => $template,
 			     variables => $variables,
-			     hole_var  => $hole_var,
+			     output_type => 'text',
 			    );
 }
 
@@ -884,7 +879,7 @@ sub sendtxthelpraw {
     close(D);
     print {$transcript} "Sending $description in separate message.\n";
     &sendmailmessage(<<END.$doc,$replyto);
-From: $gMaintainerEmail ($gProject $gBug Tracking System)
+From: "$gProject $gBug Tracking System" <$gMaintainerEmail>
 To: $replyto
 Subject: $gProject $gBug help: $description
 References: $header{'message-id'}
@@ -912,7 +907,7 @@ sub sendlynxdocraw {
     } else {
         print {$transcript} "Sending $description.\n";
         &sendmailmessage(<<END.$doc,$replyto);
-From: $gMaintainerEmail ($gProject $gBug Tracking System)
+From: "$gProject $gBug Tracking System" <$gMaintainerEmail>
 To: $replyto
 Subject: $gProject $gBugs information: $description
 References: $header{'message-id'}
@@ -949,7 +944,7 @@ sub sendinfo {
     }
     print {$transcript} "Sending $description.\n";
     &sendmailmessage(<<END.$doc,$replyto);
-From: $gMaintainerEmail ($gProject $gBug Tracking System)
+From: "$gProject $gBug Tracking System" <$gMaintainerEmail>
 To: $replyto
 Subject: $gProject $gBugs information: $description
 References: $header{'message-id'}