From 610f0e09929a5f351f7c1c3850ac7e0d83ffe388 Mon Sep 17 00:00:00 2001 From: Austin Clements Date: Sun, 25 Nov 2012 01:16:01 -0500 Subject: lib: Reject multi-message mboxes and deprecate single-message mbox Previously, we would treat multi-message mboxes as one giant email, which, besides the obvious incorrect indexing, often led to out-of-memory errors for archival mboxes. Now we explicitly reject multi-message mboxes. For historical reasons, we retain support for single-message mboxes, but official deprecate this behavior. --- test/new | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'test') diff --git a/test/new b/test/new index 29f9affc..f562cec1 100755 --- a/test/new +++ b/test/new @@ -163,7 +163,7 @@ rm -rf "${MAIL_DIR}"/two output=$(NOTMUCH_NEW) test_expect_equal "$output" "No new mail. Removed 3 messages." -test_begin_subtest "Support single-message mbox" +test_begin_subtest "Support single-message mbox (deprecated)" cat > "${MAIL_DIR}"/mbox_file1 < @@ -174,11 +174,13 @@ Body. EOF output=$(NOTMUCH_NEW 2>&1) test_expect_equal "$output" \ -"Added 1 new message to the database." +"Warning: ${MAIL_DIR}/mbox_file1 is an mbox containing a single message, +likely caused by misconfigured mail delivery. Support for single-message +mboxes is deprecated and may be removed in the future. +Added 1 new message to the database." # This test requires that notmuch new has been run at least once. test_begin_subtest "Skip and report non-mail files" -test_subtest_known_broken generate_message mkdir -p "${MAIL_DIR}"/.git && touch "${MAIL_DIR}"/.git/config touch "${MAIL_DIR}"/ignored_file -- cgit v1.2.3