debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-11-24 20:08:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

lib: drop the deprecation message for single-message mbox files

Browse source 
We generally do not support mbox files, but for historical reasons
we've supported single-message mbox files, with a deprecation
message. We've tried dropping the support altogether, but backed out
of it because we'd need to stop indexing them, while keeping support
for previously indexed files. This would be more complicated than
simply supporting single-message mbox files. Therefore, drop the
deprecation message, and just silently accept single-message mboxes.
This commit is contained in:
Jani Nikula 2014-11-23 13:15:12 +02:00 committed by David Bremner
parent c86353aa9a
commit c82a1745ac
2 changed files with 5 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
lib/message-file.c
View file

@ -170,25 +170,12 @@ _notmuch_message_file_parse (notmuch_message_file_t *message)
goto DONE;
}
if (is_mbox) {
if (! g_mime_parser_eos (parser)) {
/* This is a multi-message mbox. */
status = NOTMUCH_STATUS_FILE_NOT_EMAIL;
goto DONE;
}
if (is_mbox && ! g_mime_parser_eos (parser)) {
/*
* For historical reasons, we support single-message mboxes,
* but this behavior is likely to change in the future, so
* warn.
* This is a multi-message mbox. (For historical reasons, we
* do support single-message mboxes.)
*/
static notmuch_bool_t mbox_warning = FALSE;
if (! mbox_warning) {
mbox_warning = TRUE;
fprintf (stderr, "\
Warning: %s is an mbox containing a single message,\n\
likely caused by misconfigured mail delivery. Support for single-message\n\
mboxes is deprecated and may be removed in the future.\n", message->filename);
}
status = NOTMUCH_STATUS_FILE_NOT_EMAIL;
}
DONE:

6
test/T050-new.sh
View file

@ -173,11 +173,7 @@ Subject: Test mbox message 1
Body.
EOF
output=$(NOTMUCH_NEW 2>&1)
test_expect_equal "$output" \
"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."
test_expect_equal "$output" "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"