From: Tomi Ollila <tomi.ollila@iki.fi>
Date: Thu, 14 Nov 2013 22:03:26 +0000 (+0200)
Subject: compact: unconditionally remove old wip database compact directory
X-Git-Tag: 0.17_rc1~30
X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=commitdiff_plain;h=6452ae0fcb0a2ee45a47144da71a6de9d8dace2c

compact: unconditionally remove old wip database compact directory

In case previous notmuch compact has been interrupted there is old
work-in-progress database compact directory partially filled. Remove
it just before starting to fill the directory with new files.
---

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);