diff options
author | Sean Whitton <spwhitton@spwhitton.name> | 2018-07-12 08:33:17 +0100 |
---|---|---|
committer | Sean Whitton <spwhitton@spwhitton.name> | 2018-07-12 08:33:17 +0100 |
commit | ae8f33be945323e02e670a97c8ac6d42a0e1be40 (patch) | |
tree | 2bbf98c464b32b8ede618bf93929741246b81b5f /tests/tstunt/gpg | |
parent | 4a142fe137c1bed5a0cb5d14c41adcb3355458c4 (diff) | |
parent | 7166dbc963a9c01ce62a0564bb7b905156adb560 (diff) |
Merge tag 'debian/5.8' into stretch-bpo
dgit release 5.8 for unstable (sid) [dgit]
[dgit distro=debian]
# gpg: Signature made Sun 08 Jul 2018 11:43:29 BST
# gpg: using RSA key 559AE46C2D6B6D3265E7CBA1E3E3392348B50D39
# gpg: Can't check signature: No public key
Diffstat (limited to 'tests/tstunt/gpg')
-rwxr-xr-x | tests/tstunt/gpg | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/tests/tstunt/gpg b/tests/tstunt/gpg index 679a6b8..4214b4a 100755 --- a/tests/tstunt/gpg +++ b/tests/tstunt/gpg @@ -3,4 +3,20 @@ set -e exec \ with-lock-ex -w "$DGIT_TEST_GNUPG_GLOBAL_LOCK" \ - $tmp "$DGIT_TEST_TROOT"/tstunt/gpg-locked "$@" + sh -c ' + "$@" 9>&2 2>>"$DGIT_TEST_GNUPG_LOG" + rc=$? + if [ $rc = 0 ]; then exit 0; fi + if [ "x$DGIT_TEST_BYHAND" != x ]; then + echo >&2 "BYHAND, not dumping $DGIT_TEST_GNUPG_LOG" + else + echo >&2 "########################################" + echo >&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 \ + "$DGIT_TEST_TROOT"/tstunt/gpg-withagent "$@" |