[git] GnuPG - branch, master, updated. post-nuke-of-trailing-ws-116-gea9df94

by Werner Koch cvs at cvs.gnupg.org
Tue Nov 22 16:21:52 CET 2011


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The GNU Privacy Guard".

The branch, master has been updated
       via  ea9df94ec8d6b7b13bd65ea14caca015bd534460 (commit)
      from  958f29d2251a96d09439e591ea3523133930e5e9 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit ea9df94ec8d6b7b13bd65ea14caca015bd534460
Author: Werner Koch <wk at gnupg.org>
Date:   Tue Nov 22 15:30:26 2011 +0100

    Don't print anonymous recipient messages in quiet mode.
    
    This is bug#1378.

diff --git a/g10/ChangeLog b/g10/ChangeLog
index 8928780..c799fc9 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,3 +1,8 @@
+2011-11-22  Werner Koch  <wk at g10code.com>
+
+	* pubkey-enc.c (get_session_key): Don't print anonymous recipient
+	messages in quiet mode.  This is bug#1378.
+
 2011-11-06  Werner Koch  <wk at g10code.com>
 
 	* card-util.c (generate_card_keys): Add arg CTRL.
diff --git a/g10/pubkey-enc.c b/g10/pubkey-enc.c
index 680182b..a0fe685 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)

-----------------------------------------------------------------------

Summary of changes:
 g10/ChangeLog    |    5 +++++
 g10/pubkey-enc.c |    8 +++++---
 2 files changed, 10 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
The GNU Privacy Guard
http://git.gnupg.org




More information about the Gnupg-commits mailing list