[PATCH 9/9] lib: Don't needlessly create directory docs in _notmuch_message_remove_filename

Subject: [PATCH 9/9] lib: Don't needlessly create directory docs in _notmuch_message_remove_filename

Date: Fri, 18 May 2012 00:13:42 -0400

To: notmuch@notmuchmail.org

Cc:

From: Austin Clements

Previously, if passed a filename with a directory that did not exist
in the database, _notmuch_message_remove_filename would needlessly
create that directory document.  Fix it so that doesn't happen.
---
 lib/message.cc |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/message.cc b/lib/message.cc
index 8d552f1..6787506 100644
--- a/lib/message.cc
+++ b/lib/message.cc
@@ -541,8 +541,8 @@ _notmuch_message_remove_filename (notmuch_message_t *message,
     Xapian::TermIterator i, last;
 
     status = _notmuch_database_filename_to_direntry (
-	local, message->notmuch, filename, NOTMUCH_FIND_CREATE, &direntry);
-    if (status)
+	local, message->notmuch, filename, NOTMUCH_FIND_LOOKUP, &direntry);
+    if (status || !direntry)
 	return status;
 
     /* Unlink this file from its parent directory. */
-- 
1.7.10

Thread: