X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=lib%2Fdatabase.cc;h=d09ad99f505c63b060c6d78ed81bdc79d0b470fb;hp=d79cc3006d29a204aaa54a762aa30e0a4734ded7;hb=6452ae0fcb0a2ee45a47144da71a6de9d8dace2c;hpb=cb6cc296e27fdab85faa4bdd670eda2e0c53b8c2

diff --git a/lib/database.cc b/lib/database.cc
index d79cc300..d09ad99f 100644
--- 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);