[git] GnuPG - branch, master, updated. gnupg-2.1.0beta3-118-g8325d61

[by Werner Koch]

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  8325d616593187ff227853de0295e3269b96edcb (commit)
      from  5a66316ea4cd27e3081b2cce5385ae2429aa83b6 (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 8325d616593187ff227853de0295e3269b96edcb
Author: Werner Koch <wk at gnupg.org>
Date:   Wed Dec 19 11:21:26 2012 +0100

    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.

diff --git a/g10/pkclist.c b/g10/pkclist.c
index f805da8..e1a4428 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
                 {

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

Summary of changes:
 g10/pkclist.c |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)


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