[Pkg-gnupg-commit] [gnupg2] 164/185: g10: Make sure exactly one fingerprint is output with --quick-gen-key.

[Daniel Kahn Gillmor]

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

dkg pushed a commit to branch experimental
in repository gnupg2.

commit 94eea0ed2c8b47cb0fe02b22cbe668705a5fe0d0
Author: Marcus Brinkmann <marcus.brinkmann at ruhr-uni-bochum.de>
Date:   Wed Jul 26 18:06:29 2017 +0200

    g10: Make sure exactly one fingerprint is output with --quick-gen-key.
    
    * g10/keygen.c (do_generate_keypair): Only set fpr in
    list_keyblock_direct invocation if neither --fingerprint nor
    --with-fingerprints are given.
    
    Signed-off-by: Marcus Brinkmann <mb at g10code.com>
    GnuPG-bug-id: 2741
---
 g10/keygen.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/g10/keygen.c b/g10/keygen.c
index bfbed0e..542c1a5 100644
--- a/g10/keygen.c
+++ b/g10/keygen.c
@@ -4808,7 +4808,8 @@ do_generate_keypair (ctrl_t ctrl, struct para_data_s *para,
               tty_printf (_("public and secret key created and signed.\n") );
               tty_printf ("\n");
               merge_keys_and_selfsig (ctrl, pub_root);
-              list_keyblock_direct (ctrl, pub_root, 0, 1, 1, 1);
+
+              list_keyblock_direct (ctrl, pub_root, 0, 1, opt.fingerprint || opt.with_fingerprint, 1);
             }
 
 

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