From fe8619d29ca599cc9f38538db62d1dd42bfbee40 Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Fri, 29 Jul 2011 09:58:34 +0200 Subject: [PATCH] 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. --- g10/ChangeLog | 4 ++++ g10/tdbio.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/g10/ChangeLog b/g10/ChangeLog index 4edbf2362..6de122fb8 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,3 +1,7 @@ +2011-07-29 Werner Koch + + * tdbio.c (open_db): Do not print read-only warning in quiet mode. + 2011-07-18 Werner Koch * parse-packet.c (parse_key): Print the decoded iteration count. diff --git a/g10/tdbio.c b/g10/tdbio.c index 45ec73bae..09f31aa5d 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 )