[git] GPGME - branch, master, updated. gpgme-1.6.0-235-ge7f4c36

[by Andre Heinecke]

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  e7f4c364732660c6cda25720b7dbc5b1c917e368 (commit)
      from  e4c0645c1eea9380d80a20895eb83c9dd7228776 (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 e7f4c364732660c6cda25720b7dbc5b1c917e368
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Thu Jul 14 16:32:56 2016 +0200

    Qt: Fix usage of ignore-invalid-option in tests
    
    * Makefile.am (pubring-stamp): Fix config.

diff --git a/lang/qt/tests/Makefile.am b/lang/qt/tests/Makefile.am
index e2ded78..348c05b 100644
--- a/lang/qt/tests/Makefile.am
+++ b/lang/qt/tests/Makefile.am
@@ -69,10 +69,10 @@ export GNUPGHOME := $(abs_builddir)
 
 ./pubring-stamp: $(top_srcdir)/tests/gpg/pubdemo.asc \
 	             $(top_srcdir)/tests/gpg/secdemo.asc
-	echo "ignore-invalid-options" > gpg-agent.conf
-	echo "allow-loopback-pinentry" > gpg-agent.conf
-	echo "ignore-invalid-options" > gpg.conf
-	echo "pinentry-mode loopback" > gpg.conf
+	echo "ignore-invalid-option allow-loopback-pinentry" > $(abs_builddir)/gpg-agent.conf
+	echo "allow-loopback-pinentry" >> gpg-agent.conf
+	echo "ignore-invalid-option pinentry-mode" > gpg.conf
+	echo "pinentry-mode loopback" >> gpg.conf
 	$(GPG) --no-permission-warning \
            --import $(top_srcdir)/tests/gpg/pubdemo.asc
 	$(GPG) --no-permission-warning \

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

Summary of changes:
 lang/qt/tests/Makefile.am | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)


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