diff options
| author | Werner Koch <[email protected]> | 2012-12-19 10:21:26 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2012-12-19 10:29:37 +0000 |
| commit | 75404e2dad668a4bad3c0f06515197bcc90e9503 (patch) | |
| tree | 37022008355a476381d412e15c2e327bd0e4f9b2 | |
| parent | Remove trailing white space from a file (diff) | |
| download | gnupg-75404e2dad668a4bad3c0f06515197bcc90e9503.tar.gz gnupg-75404e2dad668a4bad3c0f06515197bcc90e9503.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 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 { |