X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;ds=sidebyside;f=notmuch-new.c;h=96a1e31e732da0b4d16cbdc374848d810904eb96;hb=02a30767116ad8abcbd0a3351f2e4d43bbbd655f;hp=598a2083ffaec689285878a6a4b873d8d6f4b245;hpb=8305f0aac7f31aeddd54d0af683475ab1492e2b7;p=notmuch

diff --git a/notmuch-new.c b/notmuch-new.c
index 598a2083..96a1e31e 100644
--- a/notmuch-new.c
+++ b/notmuch-new.c
@@ -450,6 +450,12 @@ add_files_recursive (notmuch_database_t *notmuch,
 	    fflush (stdout);
 	}
 
+	status = notmuch_database_begin_atomic (notmuch);
+	if (status) {
+	    ret = status;
+	    goto DONE;
+	}
+
 	status = notmuch_database_add_message (notmuch, next, &message);
 	switch (status) {
 	/* success */
@@ -490,6 +496,12 @@ add_files_recursive (notmuch_database_t *notmuch,
 	    goto DONE;
 	}
 
+	status = notmuch_database_end_atomic (notmuch);
+	if (status) {
+	    ret = status;
+	    goto DONE;
+	}
+
 	if (message) {
 	    notmuch_message_destroy (message);
 	    message = NULL;
@@ -728,7 +740,12 @@ remove_filename (notmuch_database_t *notmuch,
 {
     notmuch_status_t status;
     notmuch_message_t *message;
-    message = notmuch_database_find_message_by_filename (notmuch, path);
+    status = notmuch_database_begin_atomic (notmuch);
+    if (status)
+	return status;
+    status = notmuch_database_find_message_by_filename (notmuch, path, &message);
+    if (status || message == NULL)
+	return status;
     status = notmuch_database_remove_message (notmuch, path);
     if (status == NOTMUCH_STATUS_DUPLICATE_MESSAGE_ID) {
 	add_files_state->renamed_messages++;
@@ -737,6 +754,7 @@ remove_filename (notmuch_database_t *notmuch,
     } else
 	add_files_state->removed_messages++;
     notmuch_message_destroy (message);
+    notmuch_database_end_atomic (notmuch);
     return status;
 }