aboutsummaryrefslogtreecommitdiffhomepage
path: root/lib
diff options
context:
space:
mode:
authorGravatar Tomi Ollila <tomi.ollila@iki.fi>2013-11-15 00:03:26 +0200
committerGravatar David Bremner <david@tethera.net>2013-11-19 20:14:28 -0400
commit6452ae0fcb0a2ee45a47144da71a6de9d8dace2c (patch)
tree65e67a318d4db3c31104c220170b3435a2e05c1a /lib
parentcb6cc296e27fdab85faa4bdd670eda2e0c53b8c2 (diff)
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.
Diffstat (limited to 'lib')
-rw-r--r--lib/database.cc6
1 files changed, 6 insertions, 0 deletions
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);