[git] GnuPG - branch, master, updated. gnupg-2.1.6-35-g969542c

[by Werner Koch]

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, master has been updated
       via  969542c8c2f48a60c1d68b7bf70b0c00374bacba (commit)
      from  e5891a82c39997b65ce9ff90eb6120db7bedd399 (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 969542c8c2f48a60c1d68b7bf70b0c00374bacba
Author: Werner Koch <wk at gnupg.org>
Date:   Thu Aug 6 17:09:27 2015 +0200

    gpg: Adjust UID line indentation for common key algos.
    
    * g10/keylist.c (list_keyblock_print): Change UID line indentation
    * g10/mainproc.c (list_node): Ditto.
    --
    
    Due to the new keyalgo/size format the UID was not anymore printed
    properly aligned to the creation date.  Although we can't do that in
    any case, this change does it for common algos like "rsa2048",
    "dsa2048", and "ed25519".
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/g10/keylist.c b/g10/keylist.c
index b43165f..0f4c85a 100644
--- a/g10/keylist.c
+++ b/g10/keylist.c
@@ -1031,7 +1031,7 @@ list_keyblock_print (KBNODE keyblock, int secret, int fpr,
 
 	      validity = uid_trust_string_fixed (pk, uid);
 	      indent =
-		(keystrlen () + 9) -
+		(keystrlen () + (opt.legacy_list_mode? 9:11)) -
 		atoi (uid_trust_string_fixed (NULL, NULL));
 
 	      if (indent < 0 || indent > 40)
@@ -1040,7 +1040,8 @@ list_keyblock_print (KBNODE keyblock, int secret, int fpr,
 	      es_fprintf (es_stdout, "uid%*s%s ", indent, "", validity);
 	    }
 	  else
-	    es_fprintf (es_stdout, "uid%*s", (int) keystrlen () + 10, "");
+	    es_fprintf (es_stdout, "uid%*s",
+                        (int) keystrlen () + (opt.legacy_list_mode? 10:12), "");
 
 	  print_utf8_buffer (es_stdout, uid->name, uid->len);
 	  es_putc ('\n', es_stdout);
diff --git a/g10/mainproc.c b/g10/mainproc.c
index c90b9e3..f7b7c6b 100644
--- a/g10/mainproc.c
+++ b/g10/mainproc.c
@@ -1031,7 +1031,9 @@ list_node (CTX c, kbnode_t node)
                     es_printf ("%s:::::::::",
                                node->pkt->pkt.user_id->attrib_data?"uat":"uid");
                   else
-                    es_printf ("uid%*s", 28, "" );
+                    es_printf ("uid%*s",
+                               (int)keystrlen ()+(opt.legacy_list_mode? 9:11),
+                               "" );
                   print_userid (node->pkt);
                   if (opt.with_colons)
                     es_putc (':', es_stdout);

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

Summary of changes:
 g10/keylist.c  | 5 +++--
 g10/mainproc.c | 4 +++-
 2 files changed, 6 insertions(+), 3 deletions(-)


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