compact: unconditionally remove old wip database compact directory

[notmuch] / lib / database.cc

diff --git a/lib/database.cc b/lib/database.cc
index d79cc3006d29a204aaa54a762aa30e0a4734ded7..d09ad99f505c63b060c6d78ed81bdc79d0b470fb 100644 (file)
--- a/lib/database.cc
+++ b/lib/database.cc
@@ -922,6 +922,12 @@ notmuch_database_compact (const char *path,
        goto DONE;
     }
 
+    /* Unconditionally attempt to remove old work-in-progress database (if
+     * any). This is "protected" by database lock. If this fails due to write
+     * errors (etc), the following code will fail and provide error message.
+     */
+    (void) rmtree (compact_xapian_path);
+
     try {
        NotmuchCompactor compactor (status_cb, closure);