[git] GnuPG - branch, master, updated. gnupg-2.1.15-47-g38d369d

by Werner Koch cvs at cvs.gnupg.org
Thu Sep 1 19:25:24 CEST 2016


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  38d369de13acb95208a0ed8d1cf82ac19173688f (commit)
      from  fde9fa81d3d3b25a929b532cc1960d9d9f454a0c (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 38d369de13acb95208a0ed8d1cf82ac19173688f
Author: Werner Koch <wk at gnupg.org>
Date:   Thu Sep 1 19:22:48 2016 +0200

    gpg: Avoid homedir creation by --list-config
    
    * g10/gpg.c (main): Do not register a key for the list config
    commands.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/g10/gpg.c b/g10/gpg.c
index a9770d7..0b0fb7e 100644
--- a/g10/gpg.c
+++ b/g10/gpg.c
@@ -2377,11 +2377,16 @@ main (int argc, char **argv)
       {
 	switch( pargs.r_opt )
 	  {
-	  case aCheckKeys:
 	  case aListConfig:
 	  case aListGcryptConfig:
           case aGPGConfList:
           case aGPGConfTest:
+            set_cmd (&cmd, pargs.r_opt);
+            /* Do not register a keyring for these commands.  */
+            default_keyring = -1;
+            break;
+
+	  case aCheckKeys:
 	  case aListPackets:
 	  case aImport:
 	  case aFastImport:
@@ -3789,6 +3794,8 @@ main (int argc, char **argv)
       case aGenRandom:
       case aDeArmor:
       case aEnArmor:
+      case aListConfig:
+      case aListGcryptConfig:
 	break;
       case aFixTrustDB:
       case aExportOwnerTrust:

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

Summary of changes:
 g10/gpg.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
The GNU Privacy Guard
http://git.gnupg.org




More information about the Gnupg-commits mailing list