merge changes from dla source

diff --git a/Debbugs/Status.pm b/Debbugs/Status.pm
index b518a8ecbd61e115fe1055b00f9c609ecfb26397..26b8a84a8434e7469a1127ab23f1b8894cf9345a 100644 (file)
--- a/Debbugs/Status.pm
+++ b/Debbugs/Status.pm
@@ -1242,8 +1242,8 @@ sub bug_presence {
               # it; it's needed to properly handle bugs which are
               # erroneously assigned to the binary package, and we'll
               # probably have it go away eventually.
-              if (not keys %sourceversions) {
-                  push @archs, undef;
+              if (not keys %sourceversions and (not @archs or defined $archs[0])) {
+                  @archs = (undef);
                   goto GET_SOURCE_VERSIONS;
               }
          }

diff --git a/scripts/process b/scripts/process
index 4d89eecaeaa4507713e0c79a8efe423be4c20fe0..f0047dbc4d94c6cab69e10cdf872c6f941ce09d8 100755 (executable)
--- a/scripts/process
+++ b/scripts/process
@@ -721,8 +721,10 @@ if (length($resentccval)) {
 
 my $common_headers='';
 {
-    local $a = 0;
-    $common_headers = join('',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.");