security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-06-02 22:38:02 +02:00
Code Activity

gpg: Silence trustdb computation with --quiet.

Browse Source 
* g10/trustdb.c (validate_keys): Do not print log_info stuff in quiet
mode.

Signed-off-by: Werner Koch <wk@gnupg.org>
This commit is contained in:
Werner Koch 2016-03-19 14:43:18 +01:00
parent 1aad5c6277
commit af9a4afbf0
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
g10/trustdb.c
View File

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