From 8325d616593187ff227853de0295e3269b96edcb Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Wed, 19 Dec 2012 11:21:26 +0100 Subject: [PATCH] gpg: Suppress "public key already present" in quiet mode. * g10/pkclist.c (find_and_check_key, build_pk_list): Print a diagnostic only in non-quiet mode. --- g10/pkclist.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/g10/pkclist.c b/g10/pkclist.c index f805da8f1..e1a44289c 100644 --- a/g10/pkclist.c +++ b/g10/pkclist.c @@ -837,7 +837,8 @@ find_and_check_key (ctrl_t ctrl, const char *name, unsigned int use, list. */ if (!key_present_in_pk_list (*pk_list_addr, pk)) { - log_info (_("%s: skipped: public key already present\n"), name); + if (!opt.quiet) + log_info (_("%s: skipped: public key already present\n"), name); free_public_key (pk); } else @@ -945,8 +946,9 @@ build_pk_list (ctrl_t ctrl, if (key_present_in_pk_list(pk_list, pk) == 0) { free_public_key (pk); pk = NULL; - log_info (_("%s: skipped: public key already present\n"), - rov->d); + if (!opt.quiet) + log_info (_("%s: skipped: public key already present\n"), + rov->d); } else {