On Wed, 13 Nov 2013, Tomi Ollila <tomi.ollila@iki.fi> wrote: > 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 | 5 +++++ > 1 file changed, 5 insertions(+) > > diff --git a/lib/database.cc b/lib/database.cc > index ee09c5e..4b5ac64 100644 > --- a/lib/database.cc > +++ b/lib/database.cc > @@ -920,6 +920,11 @@ 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); I thought we avoid using // comments. Otherwise LGTM. > + > try { > NotmuchCompactor compactor (status_cb, closure); > > -- > 1.8.3.1 > > _______________________________________________ > notmuch mailing list > notmuch@notmuchmail.org > http://notmuchmail.org/mailman/listinfo/notmuch