[git] GnuPG - branch, STABLE-BRANCH-1-4, updated. gnupg-1.4.19-13-g8b5cb54

[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, STABLE-BRANCH-1-4 has been updated
       via  8b5cb544a8a1d9274a072990b13bb1d3cb2f6ab2 (commit)
      from  6db18e29eb81b37ed6feb592add77d492c60fc35 (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 8b5cb544a8a1d9274a072990b13bb1d3cb2f6ab2
Author: Werner Koch <wk at gnupg.org>
Date:   Fri May 8 16:30:04 2015 +0200

    gpg: Avoid cluttering stdout with trustdb info in verbose mode.
    
    * g10/trustdb.c (validate_keys): Call dump_key_array only in debug
    mode.
    --
    
    I guess that is a left-over from an early attempt to output
    information on the trustdb for use by other tools.  Maybe related to
    the former --list-trust-path command.  Sending it to stdout is
    probably useful so we do this now only in debug mode.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>
    
    Backported to STABLE-BRANCH-1-4 from
    b03a2647299a6c8764a2574590cbaccdff9e497d by dkg

diff --git a/g10/trustdb.c b/g10/trustdb.c
index e4317e2..1e3ef5f 100644
--- a/g10/trustdb.c
+++ b/g10/trustdb.c
@@ -2435,7 +2435,7 @@ validate_keys (int interactive)
         ;
 
       /* Store the calculated valididation status somewhere */
-      if (opt.verbose > 1)
+      if (opt.verbose > 1 && DBG_TRUST)
         dump_key_array (depth, keys);
 
       for (kar=keys; kar->keyblock; kar++)

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

Summary of changes:
 g10/trustdb.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


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