lib: Reject multi-message mboxes and deprecate single-message mbox

[notmuch] / lib / database.cc

diff --git a/lib/database.cc b/lib/database.cc
index 4df321738f1a5fe25e6f0e048fbcb909bb16f0bf..91d43298f3795a30aa833196c2f196e49382d671 100644 (file)
--- a/lib/database.cc
+++ b/lib/database.cc
@@ -1821,7 +1821,9 @@ notmuch_database_add_message (notmuch_database_t *notmuch,
            date = notmuch_message_file_get_header (message_file, "date");
            _notmuch_message_set_header_values (message, date, from, subject);
 
-           _notmuch_message_index_file (message, filename);
+           ret = _notmuch_message_index_file (message, filename);
+           if (ret)
+               goto DONE;
        } else {
            ret = NOTMUCH_STATUS_DUPLICATE_MESSAGE_ID;
        }