[Pkg-gnupg-commit] [gnupg2] 24/118: gpg: Fix regression in gpgv's printing of the keyid.

[Daniel Kahn Gillmor]

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

dkg pushed a commit to branch encoding-and-speling
in repository gnupg2.

commit 76304a971fe507ea659b952932ea899463ab7166
Author: Werner Koch <wk at gnupg.org>
Date:   Wed Aug 31 08:37:51 2016 +0200

    gpg: Fix regression in gpgv's printing of the keyid.
    
    * g10/keyid.c (keystr): Take care of KF_NONE != KF_DEFAULT.
    --
    
    Debian-bug-id: 836144
    Signed-off-by: Werner Koch <wk at gnupg.org>
---
 g10/keyid.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/g10/keyid.c b/g10/keyid.c
index ea6ed5e..4380151 100644
--- a/g10/keyid.c
+++ b/g10/keyid.c
@@ -403,6 +403,8 @@ keystr (u32 *keyid)
   static char keyid_str[KEYID_STR_SIZE];
   int format = opt.keyid_format;
 
+  if (format == KF_DEFAULT)
+    format = KF_NONE;
   if (format == KF_NONE)
     format = KF_LONG;
 

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