[Pkg-gnupg-commit] [gnupg2] 17/34: gpg: Make --no-auto-key-retrieve gpgconf-igurable.

[Daniel Kahn Gillmor]

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

dkg pushed a commit to branch upstream
in repository gnupg2.

commit 9bb13a0e819334681caca38c9074bd7bfc04e45e
Author: Werner Koch <wk at gnupg.org>
Date:   Fri Aug 4 22:19:37 2017 +0200

    gpg: Make --no-auto-key-retrieve gpgconf-igurable.
    
    * g10/gpg.c (gpgconf_list): Print no-auto-key-retrieve instead of
    auto-key-retrieve.
    * tools/gpgconf-comp.c (gc_options_gpg): Replace auto-key-retrieve by
    no-auto-key-retrieve and chnage level from invisible to advanced.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>
---
 g10/gpg.c            | 2 +-
 tools/gpgconf-comp.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/g10/gpg.c b/g10/gpg.c
index 39f52eb..4658a9f 100644
--- a/g10/gpg.c
+++ b/g10/gpg.c
@@ -1850,7 +1850,7 @@ gpgconf_list (const char *configfile)
   es_printf ("encrypt-to:%lu:\n", GC_OPT_FLAG_NONE);
   es_printf ("try-secret-key:%lu:\n", GC_OPT_FLAG_NONE);
   es_printf ("auto-key-locate:%lu:\n", GC_OPT_FLAG_NONE);
-  es_printf ("auto-key-retrieve:%lu:\n", GC_OPT_FLAG_NONE);
+  es_printf ("no-auto-key-retrieve:%lu:\n", GC_OPT_FLAG_NONE);
   es_printf ("log-file:%lu:\n", GC_OPT_FLAG_NONE);
   es_printf ("debug-level:%lu:\"none:\n", GC_OPT_FLAG_DEFAULT);
   es_printf ("group:%lu:\n", GC_OPT_FLAG_NONE);
diff --git a/tools/gpgconf-comp.c b/tools/gpgconf-comp.c
index 527815c..e78633f 100644
--- a/tools/gpgconf-comp.c
+++ b/tools/gpgconf-comp.c
@@ -755,7 +755,7 @@ static gc_option_t gc_options_gpg[] =
    { "auto-key-locate", GC_OPT_FLAG_NONE, GC_LEVEL_ADVANCED,
      "gnupg", N_("|MECHANISMS|use MECHANISMS to locate keys by mail address"),
      GC_ARG_TYPE_STRING, GC_BACKEND_GPG },
-   { "auto-key-retrieve", GC_OPT_FLAG_NONE, GC_LEVEL_INVISIBLE,
+   { "no-auto-key-retrieve", GC_OPT_FLAG_NONE, GC_LEVEL_ADVANCED,
      NULL, NULL, GC_ARG_TYPE_NONE, GC_BACKEND_GPG },
 
 

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