X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Debbugs%2FControl.pm;h=ab6038426da841bd8bd20f0db31728d9a4f75b9b;hb=0556c717b9847428d3350204c7acd95e9987a889;hp=8903ddefbaa76595534b1d8ebae355892a2255ba;hpb=b24bd1b5c8d818b64aa745e3fa60196692619ed7;p=debbugs.git

diff --git a/Debbugs/Control.pm b/Debbugs/Control.pm
index 8903dde..ab60384 100644
--- a/Debbugs/Control.pm
+++ b/Debbugs/Control.pm
@@ -134,7 +134,7 @@ use Mail::RFC822::Address qw();
 use POSIX qw(strftime);
 
 use Storable qw(dclone nfreeze);
-use List::Util qw(first max);
+use List::AllUtils qw(first max);
 use Encode qw(encode_utf8);
 
 use Carp;
@@ -1975,8 +1975,11 @@ sub set_merged {
 		$data->{mergedwith} = '';
 	    }
 	    else {
-		$data->{mergedwith} = join(' ',sort grep {$_ != $data->{bug_num}}
-					    keys %merged_bugs);
+		$data->{mergedwith} =
+		    join(' ',
+			 sort {$a <=> $b}
+			 grep {$_ != $data->{bug_num}}
+			 keys %merged_bugs);
 	    }
 	    append_action_to_log(bug => $data->{bug_num},
 				 command  => 'merge',
@@ -2157,11 +2160,14 @@ sub set_merged {
     }
 
     # finally, we can merge the bugs
-    my $action = "Merged ".join(' ',sort keys %merged_bugs);
+    my $action = "Merged ".join(' ',sort { $a <=> $b } keys %merged_bugs);
     for my $data (@data) {
 	my $old_data = dclone($data);
-	$data->{mergedwith} = join(' ',sort grep {$_ != $data->{bug_num}}
-				    keys %merged_bugs);
+	$data->{mergedwith} =
+	    join(' ',
+		 sort { $a <=> $b }
+		 grep {$_ != $data->{bug_num}}
+		 keys %merged_bugs);
 	append_action_to_log(bug => $data->{bug_num},
 			     command  => 'merge',
 			     new_data => $data,
@@ -3792,7 +3798,7 @@ LIMIT:	    for my $limit (make_list($param{limit}{$field})) {
 	    }
 	    if (not $match) {
 		$going_to_fail = 1;
-		print {$transcript} qq($field: ).join(', ',map{qq("$_")} make_list($data->{$field})).
+		print {$transcript} qq($field: ').join(', ',map{qq("$_")} make_list($data->{$field})).
 		    "' does not match at least one of ".
 		    join(', ',map {ref($_)?'(regex)':qq("$_")} make_list($param{limit}{$field}))."\n";
 	    }
@@ -3835,7 +3841,7 @@ sub __message_body_template{
      $extra_var ||={};
      my $hole_var = {'&bugurl' =>
 		     sub{"$_[0]: ".
-			     'http://'.$config{cgi_domain}.'/'.
+			     $config{cgi_domain}.'/'.
 				 Debbugs::CGI::bug_links(bug => $_[0],
 							 links_only => 1,
 							);