[Pkg-gnupg-commit] [gnupg2] 137/180: gpgconf: Fix --apply-defaults.

[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 6ca3c28da46873416822bf6ab7893db6c56a49d6
Author: Werner Koch <wk at gnupg.org>
Date:   Fri Dec 16 14:25:47 2016 +0100

    gpgconf: Fix --apply-defaults.
    
    * tools/gpgconf-comp.c: Skip pinentry also in process_all mode.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>
---
 tools/gpgconf-comp.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/gpgconf-comp.c b/tools/gpgconf-comp.c
index cd99c81..3fddc7c 100644
--- a/tools/gpgconf-comp.c
+++ b/tools/gpgconf-comp.c
@@ -2286,9 +2286,6 @@ gc_component_retrieve_options (int component)
   gc_backend_t backend;
   gc_option_t *option;
 
-  if (component == GC_COMPONENT_PINENTRY)
-    return; /* Dummy module for now.  */
-
   for (backend = 0; backend < GC_BACKEND_NR; backend++)
     backend_seen[backend] = 0;
 
@@ -2301,6 +2298,9 @@ gc_component_retrieve_options (int component)
 
   do
     {
+      if (component == GC_COMPONENT_PINENTRY)
+        continue; /* Skip this dummy component.  */
+
       option = gc_component[component].options;
 
       while (option && option->name)

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