diff options
| author | Werner Koch <[email protected]> | 2012-12-19 10:21:26 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2012-12-20 08:44:09 +0000 |
| commit | 3a4b96e665fa639772854058737ee3d54ba0694e (patch) | |
| tree | 1001ac250cebc5cac6b40c62b7d32f20cf35255c | |
| parent | Import only packets which are allowed in a keyblock. (diff) | |
| download | gnupg-3a4b96e665fa639772854058737ee3d54ba0694e.tar.gz gnupg-3a4b96e665fa639772854058737ee3d54ba0694e.zip | |
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)
| -rw-r--r-- | g10/pkclist.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/g10/pkclist.c b/g10/pkclist.c index 158ddf0c7..e8167c712 100644 --- a/g10/pkclist.c +++ b/g10/pkclist.c @@ -833,8 +833,9 @@ build_pk_list( STRLIST 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 { @@ -1113,8 +1114,9 @@ build_pk_list( STRLIST 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 { |