[git] GnuPG - branch, master, updated. post-nuke-of-trailing-ws-82-gfe8619d

[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  fe8619d29ca599cc9f38538db62d1dd42bfbee40 (commit)
      from  809dfd70e3d3597ac510517f3b54f40252cfd81e (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 fe8619d29ca599cc9f38538db62d1dd42bfbee40
Author: Werner Koch <wk at gnupg.org>
Date:   Fri Jul 29 09:58:34 2011 +0200

    Do not print read-only trustdb warning with --quiet.
    
    This is only a warning and gpg would anyway print an error message if
    it tries to write to the trustdb.

diff --git a/g10/ChangeLog b/g10/ChangeLog
index 4edbf23..6de122f 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,3 +1,7 @@
+2011-07-29  Werner Koch  <wk at g10code.com>
+
+	* tdbio.c (open_db): Do not print read-only warning in quiet mode.
+
 2011-07-18  Werner Koch  <wk at g10code.com>
 
 	* parse-packet.c (parse_key): Print the decoded iteration count.
diff --git a/g10/tdbio.c b/g10/tdbio.c
index 45ec73b..09f31aa 100644
--- a/g10/tdbio.c
+++ b/g10/tdbio.c
@@ -640,7 +640,7 @@ open_db()
       ) {
       /* Take care of read-only trustdbs.  */
       db_fd = open (db_name, O_RDONLY | MY_O_BINARY );
-      if (db_fd != -1)
+      if (db_fd != -1 && !opt.quiet)
           log_info (_("NOTE: trustdb not writable\n"));
   }
   if ( db_fd == -1 )

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

Summary of changes:
 g10/ChangeLog |    4 ++++
 g10/tdbio.c   |    2 +-
 2 files changed, 5 insertions(+), 1 deletions(-)


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