From ea9df94ec8d6b7b13bd65ea14caca015bd534460 Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Tue, 22 Nov 2011 15:30:26 +0100 Subject: [PATCH] Don't print anonymous recipient messages in quiet mode. This is bug#1378. --- g10/ChangeLog | 5 +++++ g10/pubkey-enc.c | 8 +++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/g10/ChangeLog b/g10/ChangeLog index 892878030..c799fc965 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,3 +1,8 @@ +2011-11-22 Werner Koch + + * pubkey-enc.c (get_session_key): Don't print anonymous recipient + messages in quiet mode. This is bug#1378. + 2011-11-06 Werner Koch * card-util.c (generate_card_keys): Add arg CTRL. diff --git a/g10/pubkey-enc.c b/g10/pubkey-enc.c index 680182b5d..a0fe685f4 100644 --- a/g10/pubkey-enc.c +++ b/g10/pubkey-enc.c @@ -110,13 +110,15 @@ get_session_key (PKT_pubkey_enc * k, DEK * dek) if (!(sk->pubkey_usage & PUBKEY_USAGE_ENC)) continue; keyid_from_pk (sk, keyid); - log_info (_("anonymous recipient; trying secret key %s ...\n"), - keystr (keyid)); + if (!opt.quiet) + log_info (_("anonymous recipient; trying secret key %s ...\n"), + keystr (keyid)); rc = get_it (k, dek, sk, keyid); if (!rc) { - log_info (_("okay, we are the anonymous recipient.\n")); + if (!opt.quiet) + log_info (_("okay, we are the anonymous recipient.\n")); break; } else if (gpg_err_code (rc) == GPG_ERR_FULLY_CANCELED)