merge changes from dla source

[debbugs.git] / scripts / process

diff --git a/scripts/process b/scripts/process
index 9cbd85c8147730b181a7488a6f0ca73b1c4f9a29..a3ea9b4a08ff0a21d8ea07dfc8d58bca59ae20de 100755 (executable)
--- a/scripts/process
+++ b/scripts/process
@@ -14,7 +14,7 @@ use IO::File;
 use MIME::Parser;
 use Debbugs::MIME qw(decode_rfc1522 create_mime_message getmailbody);
 use Debbugs::Mail qw(send_mail_message encode_headers get_addresses);
-use Debbugs::Packages qw(getpkgsrc binarytosource);
+use Debbugs::Packages qw(getpkgsrc binary_to_source);
 use Debbugs::User qw(read_usertags write_usertags);
 use Debbugs::Common qw(:lock get_hashname package_maintainer);
 use Debbugs::Status qw(writebug isstrongseverity lockreadbugmerge lockreadbug read_bug splitpackages :versions);
@@ -721,8 +721,10 @@ if (length($resentccval)) {
 
 my $common_headers='';
 {
-    local $a = 0;
-    $common_headers=map {$_.($a++%2?': ':"\n")} @common_headers;
+    my @tmp = @common_headers;
+    while (my ($key,$value) = splice(@tmp, 0,2)) {
+       $common_headers .= qq($key: $value\n);
+    }
 }
 if ($codeletter eq 'U') { # sent to -submitter
     &htmllog("Message", "sent on", $data->{originator}, "$gBug#$ref.");
@@ -1072,11 +1074,13 @@ sub checkmaintainers {
     my $anymaintfound=0; my $anymaintnotfound=0;
     for my $p (splitpackages($data->{package})) {
         $p =~ y/A-Z/a-z/;
-       $p =~ /([a-z0-9.+-]+)/;
+       $p =~ /((?:src:)?[a-z0-9.+-]+)/;
        $p = $1;
        next unless defined $p;
        if (defined $gSubscriptionDomain) {
-           my @source = binarytosource($p);
+           my @source = binary_to_source(binary => $p,
+                                         source_only => 1,
+                                        );
            if (@source) {
                push @addsrcaddrs,
                    map {"$_\@$gSubscriptionDomain"} @source;