From acd66cdec075312944e527febd46382e54d99367 Mon Sep 17 00:00:00 2001 From: Jani Nikula Date: Sat, 5 Sep 2015 12:35:31 +0300 Subject: [PATCH] cli: reset db directory mtime upon directory removal The library does not have a function to remove a directory document for a path. Usually this doesn't matter except for a slight waste of space. However, if the same directory gets added to the filesystem again, the old directory document is found with the old mtime. Reset the directory mtime on removal to avoid problems. The corner case that can hit this problem is renaming directories back and forth. Renaming does not change the mtime of the directory in the filesystem, and thus the old db directory document mtime may match the fs mtime of the directory. The long term fix might be to add a library function to remove a directory document, however this is a much simpler and faster fix for the time being. --- notmuch-new.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/notmuch-new.c b/notmuch-new.c index 514e06a4..33645349 100644 --- a/notmuch-new.c +++ b/notmuch-new.c @@ -878,6 +878,15 @@ _remove_directory (void *ctx, goto DONE; } + /* + * XXX: The library does not have a function to remove a directory + * document for a path. Usually this doesn't matter except for a + * slight waste of space. However, if the directory gets added to + * the filesystem again, the old directory document is found with + * the old mtime. Reset the directory mtime to avoid problems. + */ + notmuch_directory_set_mtime (directory, 0); + DONE: notmuch_directory_destroy (directory); return status; -- 2.26.2