summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWerner Koch <wk@gnupg.org>2011-07-29 09:58:34 +0200
committerWerner Koch <wk@gnupg.org>2011-07-29 09:58:34 +0200
commitfe8619d29ca599cc9f38538db62d1dd42bfbee40 (patch)
tree72db8ae4f2eb66d436893de798bc9723559a19ee
parentMake the inquire cancel fix a little bit more robust. (diff)
downloadgnupg2-fe8619d29ca599cc9f38538db62d1dd42bfbee40.tar.xz
gnupg2-fe8619d29ca599cc9f38538db62d1dd42bfbee40.zip
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.
-rw-r--r--g10/ChangeLog4
-rw-r--r--g10/tdbio.c2
2 files changed, 5 insertions, 1 deletions
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 <wk@g10code.com>
+
+ * tdbio.c (open_db): Do not print read-only warning in quiet mode.
+
2011-07-18 Werner Koch <wk@g10code.com>
* 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 )