From 75404e2dad668a4bad3c0f06515197bcc90e9503 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 (build_pk_list): Print two diagnostics only in non-quiet mode. -- (back-ported from commit 8325d616593187ff227853de0295e3269b96edcb) --- g10/pkclist.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/g10/pkclist.c b/g10/pkclist.c index c1f533336..85a8eeb6f 100644 --- a/g10/pkclist.c +++ b/g10/pkclist.c @@ -842,8 +842,9 @@ build_pk_list( strlist_t rcpts, PK_LIST *ret_pk_list, unsigned int use ) 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 { @@ -1122,8 +1123,9 @@ build_pk_list( strlist_t rcpts, PK_LIST *ret_pk_list, unsigned int use ) if (!key_present_in_pk_list(pk_list, pk)) { free_public_key(pk); pk = NULL; - log_info(_("%s: skipped: public key already present\n"), - remusr->d); + if (!opt.quiet) + log_info(_("%s: skipped: public key already present\n"), + remusr->d); } else {