[Pkg-gnupg-commit] [gnupg2] 185/292: common: Add GNUPG_MODULE_NAME_GPGV.

[Daniel Kahn Gillmor]

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

dkg pushed a commit to branch master
in repository gnupg2.

commit ece9ade4b44fb3d5d120cfd32b23632e5efd2134
Author: Werner Koch <wk at gnupg.org>
Date:   Thu Oct 27 11:45:01 2016 +0200

    common: Add GNUPG_MODULE_NAME_GPGV.
    
    * common/util.h (GNUPG_MODULE_NAME_GPGV): New.
    * common/homedir.c (gnupg_module_name): Implement.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>
---
 common/homedir.c | 7 +++++++
 common/util.h    | 1 +
 2 files changed, 8 insertions(+)

diff --git a/common/homedir.c b/common/homedir.c
index 574561a..13ed44c 100644
--- a/common/homedir.c
+++ b/common/homedir.c
@@ -953,6 +953,13 @@ gnupg_module_name (int which)
       X(bindir, GPG_NAME);
 #endif
 
+    case GNUPG_MODULE_NAME_GPGV:
+#if USE_GPG2_HACK
+      X(bindir, GPG_NAME "v2");
+#else
+      X(bindir, GPG_NAME "v");
+#endif
+
     case GNUPG_MODULE_NAME_CONNECT_AGENT:
       X(bindir, "gpg-connect-agent");
 
diff --git a/common/util.h b/common/util.h
index f293234..8a6732f 100644
--- a/common/util.h
+++ b/common/util.h
@@ -244,6 +244,7 @@ char *_gnupg_socketdir_internal (int skip_checks, unsigned *r_info);
 #define GNUPG_MODULE_NAME_CONNECT_AGENT 9
 #define GNUPG_MODULE_NAME_GPGCONF       10
 #define GNUPG_MODULE_NAME_DIRMNGR_LDAP  11
+#define GNUPG_MODULE_NAME_GPGV          12
 const char *gnupg_module_name (int which);
 void gnupg_module_name_flush_some (void);
 

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