[svn] GnuPG - r5228 - trunk/g10

[svn author wk]

Author: wk
Date: 2009-12-15 11:16:54 +0100 (Tue, 15 Dec 2009)
New Revision: 5228

Modified:
   trunk/g10/ChangeLog
   trunk/g10/tdbio.c
Log:
Fix bug#1162: error creating home directory


Modified: trunk/g10/ChangeLog
===================================================================
--- trunk/g10/ChangeLog	2009-12-14 20:18:53 UTC (rev 5227)
+++ trunk/g10/ChangeLog	2009-12-15 10:16:54 UTC (rev 5228)
@@ -1,6 +1,11 @@
+2009-12-15  Werner Koch  <wk at g10code.com>
+
+	* 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  <wk at g10code.com>
 
-	* 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.

Modified: trunk/g10/tdbio.c
===================================================================
--- trunk/g10/tdbio.c	2009-12-14 20:18:53 UTC (rev 5227)
+++ trunk/g10/tdbio.c	2009-12-15 10:16:54 UTC (rev 5228)
@@ -521,7 +521,8 @@
 	    *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;