merge changes from dla source

diff --git a/scripts/process.in b/scripts/process.in
index c2f4ddf9372b5dd5a8c86f8bb846b7c0117d26c6..3a0084f0988b84dbcd594b633bbf6efc6234d567 100755 (executable)
--- a/scripts/process.in
+++ b/scripts/process.in
@@ -15,7 +15,7 @@ use Debbugs::Mail qw(send_mail_message encode_headers);
 use Debbugs::Packages qw(getpkgsrc);
 use Debbugs::User qw(read_usertags write_usertags);
 use Debbugs::Common qw(:lock get_hashname);
-use Debbugs::Status qw(writebug isstrongseverity lockreadbugmerge);
+use Debbugs::Status qw(writebug isstrongseverity lockreadbugmerge lockreadbug);
 
 use Debbugs::CGI qw(html_escape bug_url);
 
@@ -493,7 +493,7 @@ if ($ref<0) {
                         Subject       => "Message with no Package: tag cannot be processed! ($subject)",
                         "Message-ID"  => "<handler.x.$nn.nonumnosub\@$gEmailDomain>",
                         "In-Reply-To" => $header{'message-id'},
-                        References    => "$header{'message-id'} $data->{msgid}",
+                        References    => join(' ',grep {defined $_} $header{'message-id'},$data->{msgid}),
                         Precedence    => 'bulk',
                         "X-$gProject-PR-Message" => 'error'
                       ],
@@ -724,8 +724,9 @@ if (length($resentccval)) {
 if (not exists $header{'x-debbugs-no-ack'} and
     ($newref or
      ($codeletter ne 'U' and
-      not defined $header{precedence} or
-      $header{'precedence'} !~ /\b(?:bulk|junk|list)\b/
+      (not defined $header{precedence} or
+       $header{'precedence'} !~ /\b(?:bulk|junk|list)\b/
+      )
      )
     )
    ){
@@ -786,7 +787,7 @@ if (not exists $header{'x-debbugs-no-ack'} and
          $t_h{pr_message} = "ack${infod} $ref";
          $t_h{reply_to}   = "$ref\@$gEmailDomain";
          $extra_vars->{refreplyto} = "$ref\@$gEmailDomain";
-         $t_h{subject}    = length($info)?
+         $t_h{subject}    = (defined $info and length($info))?
               "$gBug#$ref: Info received ($subject)" :
               "$gBug#$ref: Acknowledgement ($subject)";
      }