lib/open: do not consider .notmuch alone as an existing database.

It makes perfect sense for users to want to pre-create .notmuch,
e.g. to install hooks, so we should handle the case of a .notmuch
directory without an actual xapian database more gracefully.

diff --git a/lib/open.cc b/lib/open.cc
index a942383b84b8cda800ae8006034555e267d11119..4dd62a9f25caafc5baec4803ee883e8bca333018 100644 (file)
--- a/lib/open.cc
+++ b/lib/open.cc
@@ -662,16 +662,12 @@ notmuch_database_create_with_config (const char *database_path,
 
        err = mkdir (notmuch_path, 0755);
        if (err) {
-           if (errno == EEXIST) {
-               status = NOTMUCH_STATUS_DATABASE_EXISTS;
-               talloc_free (notmuch);
-               notmuch = NULL;
-           } else {
+           if (errno != EEXIST) {
                IGNORE_RESULT (asprintf (&message, "Error: Cannot create directory %s: %s.\n",
                                         notmuch_path, strerror (errno)));
                status = NOTMUCH_STATUS_FILE_ERROR;
+               goto DONE;
            }
-           goto DONE;
        }
     }
 

diff --git a/test/T055-path-config.sh b/test/T055-path-config.sh
index b6858d42e4287086ecf41192debc96cfb00fda81..b910e28ee6257ac8734bcde968257fb7ddb471f9 100755 (executable)
--- a/test/T055-path-config.sh
+++ b/test/T055-path-config.sh
@@ -322,7 +322,6 @@ EOF
        *)
           backup_database
           test_begin_subtest ".notmuch without xapian/ handled gracefully ($config)"
-          test_subtest_known_broken
           rm -r $XAPIAN_PATH
           test_expect_success "notmuch new"
           restore_database