From ddf01a67d6388d988f1db50a06facb21c14d9426 Mon Sep 17 00:00:00 2001 From: Daniel Kahn Gillmor Date: Sat, 25 Feb 2017 18:02:27 -0500 Subject: [PATCH] trustdb: Respect --quiet during --import-ownertrust. * g10/tdbdump.c (import_ownertrust): If opt.quiet is set, do not send log_info messages. Signed-off-by: Daniel Kahn Gillmor --- g10/tdbdump.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/g10/tdbdump.c b/g10/tdbdump.c index 41a025871..be9d1f2e6 100644 --- a/g10/tdbdump.c +++ b/g10/tdbdump.c @@ -193,18 +193,22 @@ import_ownertrust( const char *fname ) if( !rc ) { /* found: update */ if (rec.r.trust.ownertrust != otrust) { - if( rec.r.trust.ownertrust ) - log_info("changing ownertrust from %u to %u\n", - rec.r.trust.ownertrust, otrust ); - else - log_info("setting ownertrust to %u\n", otrust ); + if (!opt.quiet) + { + if( rec.r.trust.ownertrust ) + log_info("changing ownertrust from %u to %u\n", + rec.r.trust.ownertrust, otrust ); + else + log_info("setting ownertrust to %u\n", otrust ); + } rec.r.trust.ownertrust = otrust; write_record (&rec ); any = 1; } } else if (gpg_err_code (rc) == GPG_ERR_NOT_FOUND) { /* insert */ - log_info("inserting ownertrust of %u\n", otrust ); + if (!opt.quiet) + log_info("inserting ownertrust of %u\n", otrust ); memset (&rec, 0, sizeof rec); rec.recnum = tdbio_new_recnum (); rec.rectype = RECTYPE_TRUST;