aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2012-12-19 10:21:26 +0000
committerWerner Koch <[email protected]>2012-12-19 10:21:26 +0000
commit8325d616593187ff227853de0295e3269b96edcb (patch)
tree3bdc525544b3dcd8a0cbf96a8105e83a8cc1f0cf
parentfaq: Add a section on copyright assignments (diff)
downloadgnupg-8325d616593187ff227853de0295e3269b96edcb.tar.gz
gnupg-8325d616593187ff227853de0295e3269b96edcb.zip
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.
-rw-r--r--g10/pkclist.c8
1 files 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
{