[svn] GnuPG - r5230 - branches/STABLE-BRANCH-2-0/g10

[svn author wk]

Author: wk
Date: 2009-12-15 11:26:17 +0100 (Tue, 15 Dec 2009)
New Revision: 5230

Modified:
   branches/STABLE-BRANCH-2-0/g10/ChangeLog
   branches/STABLE-BRANCH-2-0/g10/tdbio.c
Log:
Fix bug#1162


Modified: branches/STABLE-BRANCH-2-0/g10/ChangeLog
===================================================================
--- branches/STABLE-BRANCH-2-0/g10/ChangeLog	2009-12-15 10:20:10 UTC (rev 5229)
+++ branches/STABLE-BRANCH-2-0/g10/ChangeLog	2009-12-15 10:26:17 UTC (rev 5230)
@@ -1,3 +1,8 @@
+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-04  Werner Koch  <wk at g10code.com>
 
 	* keygen.c (DEFAULT_STD_ALGO, DEFAULT_STD_KEYSIZE): New.

Modified: branches/STABLE-BRANCH-2-0/g10/tdbio.c
===================================================================
--- branches/STABLE-BRANCH-2-0/g10/tdbio.c	2009-12-15 10:20:10 UTC (rev 5229)
+++ branches/STABLE-BRANCH-2-0/g10/tdbio.c	2009-12-15 10:26:17 UTC (rev 5230)
@@ -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;