Re: [PATCH] doc: Allow rst2man.py as an alternative to rst2man

[notmuch-archives.git] / 83 / 984faba749849ab2de19abb30f131be8164aa3

Return-Path: <tomi.ollila@iki.fi>\r
X-Original-To: notmuch@notmuchmail.org\r
Delivered-To: notmuch@notmuchmail.org\r
Received: from localhost (localhost [127.0.0.1])\r
        by olra.theworths.org (Postfix) with ESMTP id 8F88B431FC2\r
        for <notmuch@notmuchmail.org>; Sun, 23 Nov 2014 03:42:26 -0800 (PST)\r
X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
X-Spam-Flag: NO\r
X-Spam-Score: 0\r
X-Spam-Level: \r
X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]\r
        autolearn=disabled\r
Received: from olra.theworths.org ([127.0.0.1])\r
        by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
        with ESMTP id nwuDtlG9Gz7x for <notmuch@notmuchmail.org>;\r
        Sun, 23 Nov 2014 03:42:22 -0800 (PST)\r
Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34])\r
        by olra.theworths.org (Postfix) with ESMTP id 95C1D431FBC\r
        for <notmuch@notmuchmail.org>; Sun, 23 Nov 2014 03:42:22 -0800 (PST)\r
Received: from guru.guru-group.fi (localhost [IPv6:::1])\r
        by guru.guru-group.fi (Postfix) with ESMTP id 85535100090;\r
        Sun, 23 Nov 2014 13:42:15 +0200 (EET)\r
From: Tomi Ollila <tomi.ollila@iki.fi>\r
To: Jani Nikula <jani@nikula.org>, notmuch@notmuchmail.org\r
Subject: Re: [PATCH] lib: drop the deprecation message for single-message\r
        mbox    files\r
In-Reply-To: <1416741312-26332-1-git-send-email-jani@nikula.org>\r
References: <1416741312-26332-1-git-send-email-jani@nikula.org>\r
User-Agent: Notmuch/0.19+6~g8725b09 (http://notmuchmail.org) Emacs/24.3.1\r
        (x86_64-unknown-linux-gnu)\r
X-Face: HhBM'cA~<r"^Xv\KRN0P{vn'Y"Kd;zg_y3S[4)KSN~s?O\"QPoL\r
        $[Xv_BD:i/F$WiEWax}R(MPS`^UaptOGD`*/=@\1lKoVa9tnrg0TW?"r7aRtgk[F\r
        !)g;OY^,BjTbr)Np:%c_o'jj,Z\r
Date: Sun, 23 Nov 2014 13:42:15 +0200\r
Message-ID: <m2k32mp2i0.fsf@guru.guru-group.fi>\r
MIME-Version: 1.0\r
Content-Type: text/plain\r
X-BeenThere: notmuch@notmuchmail.org\r
X-Mailman-Version: 2.1.13\r
Precedence: list\r
List-Id: "Use and development of the notmuch mail system."\r
        <notmuch.notmuchmail.org>\r
List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
        <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
List-Post: <mailto:notmuch@notmuchmail.org>\r
List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
        <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
X-List-Received-Date: Sun, 23 Nov 2014 11:42:26 -0000\r
\r
On Sun, Nov 23 2014, Jani Nikula wrote:\r
\r
> We generally do not support mbox files, but for historical reasons\r
> we've supported single-message mbox files, with a deprecation\r
> message. We've tried dropping the support altogether, but backed out\r
> of it because we'd need to stop indexing them, while keeping support\r
> for previously indexed files. This would be more complicated than\r
> simply supporting single-message mbox files. Therefore, drop the\r
> deprecation message, and just silently accept single-message mboxes.\r
> ---\r
\r
LGTM. Tests pass. +1\r
\r
Tomi\r
\r
>  lib/message-file.c | 21 ++++-----------------\r
>  test/T050-new.sh   |  6 +-----\r
>  2 files changed, 5 insertions(+), 22 deletions(-)\r
>\r
> diff --git a/lib/message-file.c b/lib/message-file.c\r
> index eda1b748e202..a41d9ad2a719 100644\r
> --- a/lib/message-file.c\r
> +++ b/lib/message-file.c\r
> @@ -170,25 +170,12 @@ _notmuch_message_file_parse (notmuch_message_file_t *message)\r
>       goto DONE;\r
>      }\r
>  \r
> -    if (is_mbox) {\r
> -     if (! g_mime_parser_eos (parser)) {\r
> -         /* This is a multi-message mbox. */\r
> -         status = NOTMUCH_STATUS_FILE_NOT_EMAIL;\r
> -         goto DONE;\r
> -     }\r
> +    if (is_mbox && ! g_mime_parser_eos (parser)) {\r
>       /*\r
> -      * For historical reasons, we support single-message mboxes,\r
> -      * but this behavior is likely to change in the future, so\r
> -      * warn.\r
> +      * This is a multi-message mbox. (For historical reasons, we\r
> +      * do support single-message mboxes.)\r
>        */\r
> -     static notmuch_bool_t mbox_warning = FALSE;\r
> -     if (! mbox_warning) {\r
> -         mbox_warning = TRUE;\r
> -         fprintf (stderr, "\\r
> -Warning: %s is an mbox containing a single message,\n\\r
> -likely caused by misconfigured mail delivery.  Support for single-message\n\\r
> -mboxes is deprecated and may be removed in the future.\n", message->filename);\r
> -     }\r
> +     status = NOTMUCH_STATUS_FILE_NOT_EMAIL;\r
>      }\r
>  \r
>    DONE:\r
> diff --git a/test/T050-new.sh b/test/T050-new.sh\r
> index ad46ee6d51b6..7119356fc9fe 100755\r
> --- a/test/T050-new.sh\r
> +++ b/test/T050-new.sh\r
> @@ -173,11 +173,7 @@ Subject: Test mbox message 1\r
>  Body.\r
>  EOF\r
>  output=$(NOTMUCH_NEW 2>&1)\r
> -test_expect_equal "$output" \\r
> -"Warning: ${MAIL_DIR}/mbox_file1 is an mbox containing a single message,\r
> -likely caused by misconfigured mail delivery.  Support for single-message\r
> -mboxes is deprecated and may be removed in the future.\r
> -Added 1 new message to the database."\r
> +test_expect_equal "$output" "Added 1 new message to the database."\r
>  \r
>  # This test requires that notmuch new has been run at least once.\r
>  test_begin_subtest "Skip and report non-mail files"\r
> -- \r
> 2.1.3\r
>\r
> _______________________________________________\r
> notmuch mailing list\r
> notmuch@notmuchmail.org\r
> http://notmuchmail.org/mailman/listinfo/notmuch\r