[git] GnuPG - branch, master, updated. gnupg-2.1.21-5-g0e1729b
by Justus Winter
cvs at cvs.gnupg.org
Wed May 17 12:18:49 CEST 2017
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The GNU Privacy Guard".
The branch, master has been updated
via 0e1729bb993648deca84a2664ae78edc848d7003 (commit)
from ae95a7f5335e605fcd71fbe4a18ed384c88d590a (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 0e1729bb993648deca84a2664ae78edc848d7003
Author: Justus Winter <justus at g10code.com>
Date: Wed May 17 12:14:55 2017 +0200
tests: Fix agent teardown in release builds.
* tests/openpgp/defs.scm (start-agent,stop-agent): Use gpg-conf which
will properly use the '--build-prefix' argument to make gpgconf use
tools from the build directory.
GnuPG-bug-id: 3165
Fixes-commit: 2c9d9ac55ea455a5ec26428989dced0311ed46cc
Signed-off-by: Justus Winter <justus at g10code.com>
diff --git a/tests/openpgp/defs.scm b/tests/openpgp/defs.scm
index 0cd45ad..a61e6c3 100644
--- a/tests/openpgp/defs.scm
+++ b/tests/openpgp/defs.scm
@@ -448,7 +448,7 @@
(with-home-directory gnupghome
(stop-agent)))))
(catch (log "Warning: Creating socket directory failed:" (car *error*))
- (call-popen `(,(tool 'gpgconf) --create-socketdir) ""))
+ (gpg-conf '--create-socketdir))
(call-check `(,(tool 'gpg-connect-agent) --verbose
,(string-append "--agent-program=" (tool 'gpg-agent)
"|--debug-quick-random")
@@ -457,9 +457,9 @@
;; Stop the agent and other daemons and remove the socket dir.
(define (stop-agent)
(log "Stopping gpg-agent...")
- (call-check `(,(tool 'gpgconf) --kill all))
+ (gpg-conf '--kill 'all)
(catch (log "Warning: Removing socket directory failed.")
- (call-popen `(,(tool 'gpgconf) --remove-socketdir) "")))
+ (gpg-conf '--remove-socketdir)))
;; end
-----------------------------------------------------------------------
Summary of changes:
tests/openpgp/defs.scm | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
hooks/post-receive
--
The GNU Privacy Guard
http://git.gnupg.org
More information about the Gnupg-commits
mailing list