[Pkg-gnupg-commit] [gnupg2] 105/205: gpg: Silence trustdb computation with --quiet.

[Daniel Kahn Gillmor]

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

dkg pushed a commit to branch experimental
in repository gnupg2.

commit af9a4afbf0b518c8acff98e50135b2beb6c722c3
Author: Werner Koch <wk at gnupg.org>
Date:   Sat Mar 19 14:43:18 2016 +0100

    gpg: Silence trustdb computation with --quiet.
    
    * g10/trustdb.c (validate_keys): Do not print log_info stuff in quiet
    mode.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>
---
 g10/trustdb.c | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/g10/trustdb.c b/g10/trustdb.c
index 8f2b2cb..1837596 100644
--- a/g10/trustdb.c
+++ b/g10/trustdb.c
@@ -1962,8 +1962,9 @@ validate_keys (int interactive)
 
   klist = utk_list;
 
-  log_info ("marginals needed: %d  completes needed: %d  trust model: %s\n",
-            opt.marginals_needed, opt.completes_needed, trust_model_string ());
+  if (!opt.quiet)
+    log_info ("marginals needed: %d  completes needed: %d  trust model: %s\n",
+              opt.marginals_needed, opt.completes_needed, trust_model_string());
 
   for (depth=0; depth < opt.max_cert_depth; depth++)
     {
@@ -2048,10 +2049,11 @@ validate_keys (int interactive)
       for (kar=keys; kar->keyblock; kar++)
           store_validation_status (depth, kar->keyblock, stored);
 
-      log_info (_("depth: %d  valid: %3d  signed: %3d"
-                  "  trust: %d-, %dq, %dn, %dm, %df, %du\n"),
-                depth, valids, key_count, ot_unknown, ot_undefined,
-                ot_never, ot_marginal, ot_full, ot_ultimate );
+      if (!opt.quiet)
+        log_info (_("depth: %d  valid: %3d  signed: %3d"
+                    "  trust: %d-, %dq, %dn, %dm, %df, %du\n"),
+                  depth, valids, key_count, ot_unknown, ot_undefined,
+                  ot_never, ot_marginal, ot_full, ot_ultimate );
 
       /* Build a new kdlist from all fully valid keys in KEYS */
       if (klist != utk_list)
@@ -2120,8 +2122,9 @@ validate_keys (int interactive)
       else
         {
           tdbio_write_nextcheck (next_expire);
-          log_info (_("next trustdb check due at %s\n"),
-                    strtimestamp (next_expire));
+          if (!opt.quiet)
+            log_info (_("next trustdb check due at %s\n"),
+                      strtimestamp (next_expire));
         }
 
       rc2 = tdbio_update_version_record ();

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