undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'st/lib-gpg-kill-stray-agent'

Browse Source 
Some versions of GnuPG fails to kill gpg-agent it auto-spawned
and such a left-over agent can interfere with a test.  Work it
around by attempting to kill one before starting a new test.

* st/lib-gpg-kill-stray-agent:
  t: lib-gpg: flush gpg agent on startup
This commit is contained in:
Junio C Hamano 2017-08-11 13:27:00 -07:00
commit a6f1456380
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
t/lib-gpg.sh
View File

@ -31,6 +31,7 @@ then
chmod 0700 ./gpghome && chmod 0700 ./gpghome &&
GNUPGHOME="$(pwd)/gpghome" && GNUPGHOME="$(pwd)/gpghome" &&
export GNUPGHOME && export GNUPGHOME &&
(gpgconf --kill gpg-agent 2>&1 >/dev/null || : ) &&
gpg --homedir "${GNUPGHOME}" 2>/dev/null --import \ gpg --homedir "${GNUPGHOME}" 2>/dev/null --import \
"$TEST_DIRECTORY"/lib-gpg/keyring.gpg && "$TEST_DIRECTORY"/lib-gpg/keyring.gpg &&
gpg --homedir "${GNUPGHOME}" 2>/dev/null --import-ownertrust \ gpg --homedir "${GNUPGHOME}" 2>/dev/null --import-ownertrust \