[Pkg-gnupg-commit] [gpgme] 327/412: core: Check for gpg version for loopback mode

[Daniel Kahn Gillmor]

This is an automated email from the git hooks/post-receive script.

dkg pushed a commit to branch master
in repository gpgme.

commit e8cb143c8337b122a6790f769ddb0a97c4baccd3
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Tue Sep 6 16:30:24 2016 +0200

    core: Check for gpg version for loopback mode
    
    * src/engine-gpg.c (build_argv): Check for version 2.1.0
    before adding pinentry-mode.
    
    --
    This is a compatibility fix for older versions that don't support
    this flag which would otherwise result in an invalid argument
    error.
---
 src/engine-gpg.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/engine-gpg.c b/src/engine-gpg.c
index 7036ee0..3f77ba8 100644
--- a/src/engine-gpg.c
+++ b/src/engine-gpg.c
@@ -866,7 +866,7 @@ build_argv (engine_gpg_t gpg, const char *pgmname)
       argc++;
     }
 
-  if (gpg->pinentry_mode)
+  if (gpg->pinentry_mode && have_gpg_version (gpg, "2.1.0"))
     {
       const char *s = NULL;
       switch (gpg->pinentry_mode)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gpgme.git