stop including the full backtrace

diff --git a/scripts/service b/scripts/service
index 77b5ecae83627dc88bf0be2e3a693edd980bdeb1..98a9e11d62493365185814d8ef317264cc8aa049 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++;