[svn] GnuPG - r5229 - branches/STABLE-BRANCH-1-4/g10

[svn author wk]

Author: wk
Date: 2009-12-15 11:20:10 +0100 (Tue, 15 Dec 2009)
New Revision: 5229

Modified:
   branches/STABLE-BRANCH-1-4/g10/ChangeLog
   branches/STABLE-BRANCH-1-4/g10/tdbio.c
Log:
fix bug#1162.


Modified: branches/STABLE-BRANCH-1-4/g10/ChangeLog
===================================================================
--- branches/STABLE-BRANCH-1-4/g10/ChangeLog	2009-12-15 10:16:54 UTC (rev 5228)
+++ branches/STABLE-BRANCH-1-4/g10/ChangeLog	2009-12-15 10:20:10 UTC (rev 5229)
@@ -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-09-28  Werner Koch  <wk at g10code.com>
 
 	* trustdb.c (get_validity_info): Take care of a NULL PK.  Fixes

Modified: branches/STABLE-BRANCH-1-4/g10/tdbio.c
===================================================================
--- branches/STABLE-BRANCH-1-4/g10/tdbio.c	2009-12-15 10:16:54 UTC (rev 5228)
+++ branches/STABLE-BRANCH-1-4/g10/tdbio.c	2009-12-15 10:20:10 UTC (rev 5229)
@@ -508,7 +508,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 = DIRSEP_C;