From 6452ae0fcb0a2ee45a47144da71a6de9d8dace2c Mon Sep 17 00:00:00 2001 From: Tomi Ollila Date: Fri, 15 Nov 2013 00:03:26 +0200 Subject: [PATCH] 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. --- lib/database.cc | 6 ++++++ 1 file changed, 6 insertions(+) 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); -- 2.43.0