[git] GnuPG - branch, master, updated. post-nuke-of-trailing-ws-46-gdd491d2

[by Marcus Brinkmann]

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  dd491d290ad973fd1b73ab83ad0139449008c62a (commit)
      from  70b871abbc4ec0968152968c10269cee72286df3 (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 dd491d290ad973fd1b73ab83ad0139449008c62a
Author: Marcus Brinkmann <marcus.brinkmann at ruhr-uni-bochum.de>
Date:   Wed Apr 20 22:41:22 2011 +0200

    2011-04-20  Marcus Brinkmann  <mb at g10code.com>
    
            * keylist.c (list_keyblock_colon): Use get_ownertrust_info, not
            get_ownertrust (which lead to binary zeroes in the output!).

diff --git a/g10/ChangeLog b/g10/ChangeLog
index ed958c5..a1c608f 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,3 +1,8 @@
+2011-04-20  Marcus Brinkmann  <mb at g10code.com>
+
+	* keylist.c (list_keyblock_colon): Use get_ownertrust_info, not
+	get_ownertrust (which lead to binary zeroes in the output!).
+
 2011-03-23  Werner Koch  <wk at g10code.com>
 
 	* parse-packet.c (read_rest): Drop unsed PARTIAL arg.  Rewrite to
diff --git a/g10/keylist.c b/g10/keylist.c
index 968aa95..db7467d 100644
--- a/g10/keylist.c
+++ b/g10/keylist.c
@@ -1161,7 +1161,7 @@ list_keyblock_colon (KBNODE keyblock, int secret, int fpr)
           colon_datestr_from_pk (pk), colon_strtime (pk->expiredate));
 
   if (!opt.fast_list_mode && !opt.no_expensive_trust_checks)
-    es_putc (get_ownertrust (pk), es_stdout);
+    es_putc (get_ownertrust_info (pk), es_stdout);
   es_putc (':', es_stdout);
 
   es_putc (':', es_stdout);

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

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


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