merge changes from dla source branch

[debbugs.git] / scripts / service

diff --git a/scripts/service b/scripts/service
index 77b5ecae83627dc88bf0be2e3a693edd980bdeb1..1cf0e40d58925a680fd90654f83d3f3e16d30854 100755 (executable)
--- a/scripts/service
+++ b/scripts/service
@@ -857,7 +857,7 @@ END
        };
        if ($@) {
            $errors++;
-           print {$transcript} "Failed to unmerge $ref: $@".cleanup_eval_fail($@,$debug)."\n";
+           print {$transcript} "Failed to unmerge $ref: ".cleanup_eval_fail($@,$debug)."\n";
        }
     } elsif (m/^merge\s+#?(-?\d+(\s+#?-?\d+)+)\s*$/i) {
        $ok++;
@@ -872,7 +872,7 @@ END
        };
        if ($@) {
            $errors++;
-           print {$transcript} "Failed to merge $ref: $@".cleanup_eval_fail($@,$debug)."\n";
+           print {$transcript} "Failed to merge $ref: ".cleanup_eval_fail($@,$debug)."\n";
        }
     } elsif (m/^forcemerge\s+\#?(-?\d+(?:\s+\#?-?\d+)+)\s*$/i) {
        $ok++;
@@ -1114,7 +1114,10 @@ my $reply =
                         Precedence    => 'bulk',
                         keys %affected_packages ?("X-${gProject}-PR-Package" => join(' ',keys %affected_packages)):(),
                         keys %affected_packages ?("X-${gProject}-PR-Source" =>
-                                                  join(' ',grep {defined $_} map {binary_to_source(binary => $_)} keys %affected_packages)):(),
+                                                  join(' ',
+                                                       map {defined $_ ?(ref($_)?@{$_}:$_):()}
+                                                       binary_to_source(binary => [keys %affected_packages],
+                                                                        source_only => 1))):(),
                         "X-$gProject-PR-Message" => 'transcript',
                         @common_headers,
                        ],