From: Tomi Ollila Date: Sun, 23 Nov 2014 11:42:15 +0000 (+0200) Subject: Re: [PATCH] lib: drop the deprecation message for single-message mbox files X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=3d302745c6c3056f245a2bd603e29c62c5e1f494;p=notmuch-archives.git Re: [PATCH] lib: drop the deprecation message for single-message mbox files --- diff --git a/83/984faba749849ab2de19abb30f131be8164aa3 b/83/984faba749849ab2de19abb30f131be8164aa3 new file mode 100644 index 000000000..5f15cf8dd --- /dev/null +++ b/83/984faba749849ab2de19abb30f131be8164aa3 @@ -0,0 +1,128 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id 8F88B431FC2 + for ; Sun, 23 Nov 2014 03:42:26 -0800 (PST) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: 0 +X-Spam-Level: +X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none] + autolearn=disabled +Received: from olra.theworths.org ([127.0.0.1]) + by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id nwuDtlG9Gz7x for ; + Sun, 23 Nov 2014 03:42:22 -0800 (PST) +Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34]) + by olra.theworths.org (Postfix) with ESMTP id 95C1D431FBC + for ; Sun, 23 Nov 2014 03:42:22 -0800 (PST) +Received: from guru.guru-group.fi (localhost [IPv6:::1]) + by guru.guru-group.fi (Postfix) with ESMTP id 85535100090; + Sun, 23 Nov 2014 13:42:15 +0200 (EET) +From: Tomi Ollila +To: Jani Nikula , notmuch@notmuchmail.org +Subject: Re: [PATCH] lib: drop the deprecation message for single-message + mbox files +In-Reply-To: <1416741312-26332-1-git-send-email-jani@nikula.org> +References: <1416741312-26332-1-git-send-email-jani@nikula.org> +User-Agent: Notmuch/0.19+6~g8725b09 (http://notmuchmail.org) Emacs/24.3.1 + (x86_64-unknown-linux-gnu) +X-Face: HhBM'cA~ +MIME-Version: 1.0 +Content-Type: text/plain +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.13 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +X-List-Received-Date: Sun, 23 Nov 2014 11:42:26 -0000 + +On Sun, Nov 23 2014, Jani Nikula wrote: + +> 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. +> --- + +LGTM. Tests pass. +1 + +Tomi + +> lib/message-file.c | 21 ++++----------------- +> test/T050-new.sh | 6 +----- +> 2 files changed, 5 insertions(+), 22 deletions(-) +> +> diff --git a/lib/message-file.c b/lib/message-file.c +> index eda1b748e202..a41d9ad2a719 100644 +> --- a/lib/message-file.c +> +++ b/lib/message-file.c +> @@ -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: +> diff --git a/test/T050-new.sh b/test/T050-new.sh +> index ad46ee6d51b6..7119356fc9fe 100755 +> --- a/test/T050-new.sh +> +++ b/test/T050-new.sh +> @@ -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" +> -- +> 2.1.3 +> +> _______________________________________________ +> notmuch mailing list +> notmuch@notmuchmail.org +> http://notmuchmail.org/mailman/listinfo/notmuch