[git] GnuPG - branch, STABLE-BRANCH-2-0, updated. gnupg-2.0.29-10-gfea9d43

[by NIIBE Yutaka]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The GNU Privacy Guard".

The branch, STABLE-BRANCH-2-0 has been updated
       via  fea9d4354c93b662c75febe020fb799ce4f2ec89 (commit)
      from  47a499eaa2630b331afbf3c56c6ec6e7f300eb8c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit fea9d4354c93b662c75febe020fb799ce4f2ec89
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Tue Sep 29 13:45:20 2015 +0900

    gpg: Improve 'General key info' line of --card-status.
    
    * g10/keylist.c (print_pubkey_info): Print either "pub" or "sub".
    
    --
    
    This now prints "sub" if the first used card key is actually a subkey.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>
    
    GnuPG-bug-id: 2079
    
    (backported from master 874ef16e70ab750db7b153f17a7e859a0db6a2f1)

diff --git a/g10/keylist.c b/g10/keylist.c
index 457695b..8db2147 100644
--- a/g10/keylist.c
+++ b/g10/keylist.c
@@ -164,12 +164,14 @@ print_pubkey_info (FILE *fp, PKT_public_key *pk)
     p=get_user_id_native(keyid);
 
   if (fp)
-    fprintf (fp, "pub  %4u%c/%s %s %s\n",
+    fprintf (fp, "%s  %4u%c/%s %s %s\n",
+             pk->is_primary? "pub":"sub",
              nbits_from_pk (pk),
              pubkey_letter (pk->pubkey_algo),
              keystr(keyid), datestr_from_pk (pk), p);
   else
-    tty_printf ("\npub  %4u%c/%s %s %s\n",
+    tty_printf ("\n%s  %4u%c/%s %s %s\n",
+                pk->is_primary? "pub":"sub",
                 nbits_from_pk (pk), pubkey_letter (pk->pubkey_algo),
                 keystr(keyid), datestr_from_pk (pk), p);
 

-----------------------------------------------------------------------

Summary of changes:
 g10/keylist.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
The GNU Privacy Guard
http://git.gnupg.org