From 77cba976ddcf863c5175cdbb9a9002bc60069904 Mon Sep 17 00:00:00 2001
From: Don Armstrong <don@donarmstrong.com>
Date: Mon, 19 Mar 2012 14:25:57 -0700
Subject: [PATCH] stop including the full backtrace

---
 scripts/service | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/service b/scripts/service
index 77b5eca..98a9e11 100755
--- 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++;
-- 
2.39.2