From 4364283f757fceab454d48d461a9f88c31247a07 Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Fri, 7 Oct 2022 15:01:02 +0200 Subject: wkd: Silence gpg-wks-client diagnostics from gpg. * tools/gpg-wks-client.c (add_user_id): PAss --quiet to gpg unless we are running in double verbose mode. (decrypt_stream): Ditto (encrypt_response): Ditto. (mirror_one_keys_userid): Ditto. * tools/wks-util.c (wks_get_key): Ditto. (wks_list_key): Ditto. (wks_filter_uid): Ditto. --- tools/wks-util.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'tools/wks-util.c') diff --git a/tools/wks-util.c b/tools/wks-util.c index e1d08b9ed..a1640d772 100644 --- a/tools/wks-util.c +++ b/tools/wks-util.c @@ -216,9 +216,9 @@ wks_get_key (estream_t *r_key, const char *fingerprint, const char *addrspec, ccparray_init (&ccp, 0); ccparray_put (&ccp, "--no-options"); - if (!opt.verbose) + if (opt.verbose < 2) ccparray_put (&ccp, "--quiet"); - else if (opt.verbose > 1) + else ccparray_put (&ccp, "--verbose"); ccparray_put (&ccp, "--batch"); ccparray_put (&ccp, "--status-fd=2"); @@ -313,9 +313,9 @@ wks_list_key (estream_t key, char **r_fpr, uidinfo_list_t *r_mboxes) ccparray_init (&ccp, 0); ccparray_put (&ccp, "--no-options"); - if (!opt.verbose) + if (opt.verbose < 2) ccparray_put (&ccp, "--quiet"); - else if (opt.verbose > 1) + else ccparray_put (&ccp, "--verbose"); ccparray_put (&ccp, "--batch"); ccparray_put (&ccp, "--status-fd=2"); @@ -489,9 +489,9 @@ wks_filter_uid (estream_t *r_newkey, estream_t key, const char *uid, ccparray_init (&ccp, 0); ccparray_put (&ccp, "--no-options"); - if (!opt.verbose) + if (opt.verbose < 2) ccparray_put (&ccp, "--quiet"); - else if (opt.verbose > 1) + else ccparray_put (&ccp, "--verbose"); ccparray_put (&ccp, "--batch"); ccparray_put (&ccp, "--status-fd=2"); -- cgit v1.2.3