From: David Bremner <david@tethera.net>
Date: Sun, 4 Dec 2022 02:28:55 +0000 (-0400)
Subject: lib/database: propagate status code from _notmuch_message_delete
X-Git-Tag: 0.38_rc0~59
X-Git-Url: https://git.cworth.org/git?p=notmuch;a=commitdiff_plain;h=16d92abf9f3326da1ec0c6f84c2c8876efc77ecb

lib/database: propagate status code from _notmuch_message_delete

_notmuch_message_delete can return (at least)
NOTMUCH_STATUS_XAPIAN_EXCEPTION, which we should not ignore.
---

diff --git a/lib/database.cc b/lib/database.cc
index c05d70d3..d1e5f1af 100644
--- a/lib/database.cc
+++ b/lib/database.cc
@@ -1456,7 +1456,7 @@ notmuch_database_remove_message (notmuch_database_t *notmuch,
     if (status == NOTMUCH_STATUS_SUCCESS && message) {
 	status = _notmuch_message_remove_filename (message, filename);
 	if (status == NOTMUCH_STATUS_SUCCESS)
-	    _notmuch_message_delete (message);
+	    status = _notmuch_message_delete (message);
 	else if (status == NOTMUCH_STATUS_DUPLICATE_MESSAGE_ID)
 	    _notmuch_message_sync (message);