From c9271f6d58d940578c89ec9437a831a3c345f0bc Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Tue, 15 Dec 2009 10:16:54 +0000 Subject: [PATCH] Fix bug#1162: error creating home directory --- g10/ChangeLog | 7 ++++++- g10/tdbio.c | 3 ++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/g10/ChangeLog b/g10/ChangeLog index 873167c17..734a00bb4 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,6 +1,11 @@ +2009-12-15 Werner Koch + + * tdbio.c (tdbio_set_dbname): Do not call log_fatal after creating + the directory. Fixes bug#1169. Reported by Daniel Leidert. + 2009-12-08 Werner Koch - * keyring.h: Include userids.h. + * keyring.h: Include userids.h. * gpg.h (KEYDB_SEARCH_DESC): Remove. * packet.h: Include userids.h. (PKT_user_id): Declare using gpg_pkt_user_id_s. diff --git a/g10/tdbio.c b/g10/tdbio.c index e65af9a4a..c364cb582 100644 --- a/g10/tdbio.c +++ b/g10/tdbio.c @@ -521,7 +521,8 @@ tdbio_set_dbname( const char *new_dbname, int create ) *p = 0; if( access( fname, F_OK ) ) { try_make_homedir( fname ); - log_fatal( _("%s: directory does not exist!\n"), fname ); + if (access (fname, F_OK )) + log_fatal (_("%s: directory does not exist!\n"), fname); } *p = save_slash;