[Pkg-gnupg-commit] [gnupg2] 20/34: gpg: gpgconf needs to support the now default --auto-key-retrieve.

[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 69e97d909d586160cc0631c9a6f4d3f24bb0c682
Author: Werner Koch <wk at gnupg.org>
Date:   Sat Aug 5 14:26:22 2017 +0200

    gpg: gpgconf needs to support the now default --auto-key-retrieve.
    
    * tools/gpgconf-comp.c (gc_options_gpg): Re-add "auto-key_retrieve".
    --
    
    Although this option is invisible, it might be in use by gpgconf
    profiles.  We don't want to break them.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>
---
 tools/gpgconf-comp.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tools/gpgconf-comp.c b/tools/gpgconf-comp.c
index e78633f..59a6398 100644
--- a/tools/gpgconf-comp.c
+++ b/tools/gpgconf-comp.c
@@ -755,6 +755,8 @@ 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,
+     NULL, NULL, GC_ARG_TYPE_NONE, GC_BACKEND_GPG },
    { "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