[git] GPGME - branch, master, updated. gpgme-1.11.1-295-g9f19b3a

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 "GnuPG Made Easy".

The branch, master has been updated
       via  9f19b3aaecd23a12b2e6692faeefa936e490d343 (commit)
       via  a824f4498ea9bae5dca515c56e2455ec0ce98b50 (commit)
      from  5cb67257f2b3b5fcfd3444e366f26a0f2ae09504 (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 9f19b3aaecd23a12b2e6692faeefa936e490d343
Author: Werner Koch <[email protected]>
Date:   Thu Sep 20 11:58:02 2018 +0200

    python: Fix regression in the test suite.
    
    * lang/python/tests/Makefile.am (GNUPGHOME): Remove stray backslash.
    --
    
    Fixes-commit: d09d19fa9fe1e81dd819b32208b4bd09f83e3918
    Signed-off-by: Werner Koch <[email protected]>

diff --git a/lang/python/tests/Makefile.am b/lang/python/tests/Makefile.am
index d901285..d26d33d 100644
--- a/lang/python/tests/Makefile.am
+++ b/lang/python/tests/Makefile.am
@@ -21,7 +21,7 @@ GPG_AGENT = gpg-agent
 
 test_srcdir = $(top_srcdir)/tests/gpg
 
-GNUPGHOME=$(abs_builddir) \
+GNUPGHOME=$(abs_builddir)
 TESTS_ENVIRONMENT = GNUPGHOME=$(GNUPGHOME) \
 	LC_ALL=C GPG_AGENT_INFO= \
 	top_srcdir=$(top_srcdir) \

commit a824f4498ea9bae5dca515c56e2455ec0ce98b50
Author: Werner Koch <[email protected]>
Date:   Wed Sep 19 17:28:29 2018 +0200

    tests: Don't try using keys from a scmartcard.
    
    * tests/gpg/Makefile.am: Disable scdaemon
    * lang/python/tests/Makefile.am: Ditto.
    
    Signed-off-by: Werner Koch <[email protected]>

diff --git a/lang/python/tests/Makefile.am b/lang/python/tests/Makefile.am
index 6297076..d901285 100644
--- a/lang/python/tests/Makefile.am
+++ b/lang/python/tests/Makefile.am
@@ -119,3 +119,7 @@ gpg.conf:
 gpg-agent.conf:
 # This is required for gpg2, which does not support command fd.
 	echo pinentry-program $(abs_top_srcdir)/tests/gpg/pinentry >$@
+	echo disable-scdaemon >> $@
+
+
+# end-of-file
diff --git a/tests/gpg/Makefile.am b/tests/gpg/Makefile.am
index 392fc89..ba2d1f3 100644
--- a/tests/gpg/Makefile.am
+++ b/tests/gpg/Makefile.am
@@ -105,5 +105,11 @@ gpg.conf:
 	echo no-force-v3-sigs > ./gpg.conf
 
 gpg-agent.conf:
-# This is required for gpg2, which does not support command fd.
+# This is required for gpg2, which does not support command fd for the
+# passphrase.  disable-scdaemon is required so that we don't try using
+# a key from a smartcard reader (error might be: Unusable secret key)
 	echo pinentry-program $(abs_srcdir)/pinentry > ./gpg-agent.conf
+	echo disable-scdaemon >> ./gpg-agent.conf
+
+
+# end-of-file

-----------------------------------------------------------------------

Summary of changes:
 lang/python/tests/Makefile.am | 6 +++++-
 tests/gpg/Makefile.am         | 8 +++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
GnuPG Made Easy
http://git.gnupg.org