[Pkg-gnupg-commit] [gnupg2] 14/34: gpg: Avoid double fingerprint printing with import-show.

[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 b54d75fb1dcfa2cebb3a2497b81ffb49acac2056
Author: Werner Koch <wk at gnupg.org>
Date:   Fri Aug 4 17:09:17 2017 +0200

    gpg: Avoid double fingerprint printing with import-show.
    
    * g10/import.c (import_one) <IMPORT_SHOW>: Take care of fingerprint
    options.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>
---
 g10/import.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/g10/import.c b/g10/import.c
index b1b8e0f..5b55f8f 100644
--- a/g10/import.c
+++ b/g10/import.c
@@ -1778,7 +1778,8 @@ import_one (ctrl_t ctrl,
       merge_keys_done = 1;
       /* Note that we do not want to show the validity because the key
        * has not yet imported.  */
-      list_keyblock_direct (ctrl, keyblock, 0, 0, 1, 1);
+      list_keyblock_direct (ctrl, keyblock, 0, 0,
+                            opt.fingerprint || opt.with_fingerprint, 1);
       es_fflush (es_stdout);
     }
 

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