diff options
| author | Werner Koch <[email protected]> | 2011-07-29 08:00:15 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2011-07-29 08:00:15 +0000 |
| commit | dea8ad45355beebf2be029263002dcbd9c74bd7d (patch) | |
| tree | 9618c59dd1e6bf843b18676c2f00a2f0fc7b65ea | |
| parent | Update config.{guess,sub}. (diff) | |
| download | gnupg-dea8ad45355beebf2be029263002dcbd9c74bd7d.tar.gz gnupg-dea8ad45355beebf2be029263002dcbd9c74bd7d.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/ChangeLog | 4 | ||||
| -rw-r--r-- | g10/tdbio.c | 8 |
2 files changed, 8 insertions, 4 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog index c0a4c732d..806e5ce48 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,3 +1,7 @@ +2011-07-29 Werner Koch <[email protected]> + + * tdbio.c (open_db): Do not print read-only warning in quiet mode. + 2011-07-22 Werner Koch <[email protected]> * parse-packet.c (parse_key): Print the decoded iteration count. diff --git a/g10/tdbio.c b/g10/tdbio.c index 738f758ee..306935c06 100644 --- a/g10/tdbio.c +++ b/g10/tdbio.c @@ -449,7 +449,7 @@ create_version_record (void) { TRUSTREC rec; int rc; - + memset( &rec, 0, sizeof rec ); rec.r.ver.version = 3; rec.r.ver.created = make_timestamp(); @@ -609,7 +609,7 @@ open_db() ) ) { 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 ) @@ -692,7 +692,7 @@ tdbio_read_model(void) { TRUSTREC vr; int rc; - + rc = tdbio_read_record( 0, &vr, RECTYPE_VER ); if( rc ) log_fatal( _("%s: error reading version record: %s\n"), @@ -1010,7 +1010,7 @@ drop_from_hashtable( ulong table, byte *key, int keylen, ulong recnum ) */ static int lookup_hashtable( ulong table, const byte *key, size_t keylen, - int (*cmpfnc)(const void*, const TRUSTREC *), + int (*cmpfnc)(const void*, const TRUSTREC *), const void *cmpdata, TRUSTREC *rec ) { int rc; |