X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=tests%2Ftstunt%2Fgpg;h=4214b4a169f9ea632ac896bc282bf499bd9edebd;hp=7e12846c46470a1418d7b53a6f49b33018555dbb;hb=8916ea3e2ca88820e6ad1d0c8823a37221f8ed88;hpb=690272dfb77eefa9277970dafe4bbb47de3b35e1

diff --git a/tests/tstunt/gpg b/tests/tstunt/gpg
index 7e12846c..4214b4a1 100755
--- a/tests/tstunt/gpg
+++ b/tests/tstunt/gpg
@@ -6,14 +6,16 @@ with-lock-ex -w "$DGIT_TEST_GNUPG_GLOBAL_LOCK" \
 	sh -c '
 		"$@" 9>&2 2>>"$DGIT_TEST_GNUPG_LOG"
 		rc=$?
-		if [ rc = 0 ]; then exit 0; fi
+		if [ $rc = 0 ]; then exit 0; fi
 		if [ "x$DGIT_TEST_BYHAND" != x ]; then
-			echo >&2 "BYHAND, not catting $DGIT_TEST_GNUPG_LOG"
+			echo >&2 "BYHAND, not dumping $DGIT_TEST_GNUPG_LOG"
 		else
 			echo >&2 "########################################"
 			echo >&2 "$DGIT_TEST_GNUPG_LOG"
-			cat >&2 "$DGIT_TEST_GNUPG_LOG"
+			sed '\''s/^/\[gnupg-workarounds] /'\'' >&2 \
+				"$DGIT_TEST_GNUPG_LOG"
 			echo >&2 "end of $DGIT_TEST_GNUPG_LOG"
+			echo >&2 "########################################"
 		fi
 		exit $rc
 	' x \