From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 30 Jun 2018 18:03:10 +0000 (+0100)
Subject: test suite: gpg agent workaround: Fix bugs in log neatening.
X-Git-Tag: archive/debian/5.5+exp9^0
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=8916ea3e2ca88820e6ad1d0c8823a37221f8ed88

test suite: gpg agent workaround: Fix bugs in log neatening.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/debian/changelog b/debian/changelog
index 3f363e42..852adc76 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+dgit (5.5+exp9) experimental; urgency=medium
+
+  * test suite: gpg agent workaround: Fix bugs in log neatening.
+
+ -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Sat, 30 Jun 2018 19:03:00 +0100
+
 dgit (5.5+exp8) experimental; urgency=medium
 
   * test suite: gpg agent workaround: Neaten the logging.
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 \