Re: Bug#749890: python3-notmuch: missing header in mbox message -> NullPointerError

diff --git a/61/21a117fb684730e55277dead485d61d8fe2ac1 b/61/21a117fb684730e55277dead485d61d8fe2ac1
new file mode 100644 (file)
index 0000000..bb6aea6
--- /dev/null
+++ b/61/21a117fb684730e55277dead485d61d8fe2ac1
@@ -0,0 +1,104 @@
+Return-Path: <david@tethera.net>\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 B442A431FBD\r
+       for <notmuch@notmuchmail.org>; Fri, 27 Jun 2014 08:46:17 -0700 (PDT)\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 V9vDRIqjFUN7 for <notmuch@notmuchmail.org>;\r
+       Fri, 27 Jun 2014 08:46:10 -0700 (PDT)\r
+Received: from yantan.tethera.net (yantan.tethera.net [199.188.72.155])\r
+       (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 81BFA431FAE\r
+       for <notmuch@notmuchmail.org>; Fri, 27 Jun 2014 08:46:10 -0700 (PDT)\r
+Received: from remotemail by yantan.tethera.net with local (Exim 4.80)\r
+       (envelope-from <david@tethera.net>)\r
+       id 1X0YLg-0001Eg-Ks; Fri, 27 Jun 2014 12:46:00 -0300\r
+Received: (nullmailer pid 28669 invoked by uid 1000); Fri, 27 Jun 2014\r
+       15:45:56 -0000\r
+From: David Bremner <david@tethera.net>\r
+To: Jakub Wilk <jwilk@debian.org>, 749890@bugs.debian.org\r
+Subject: Re: Bug#749890: python3-notmuch: missing header in mbox message ->\r
+       NullPointerError\r
+In-Reply-To: <20140626213100.GA8930@jwilk.net>\r
+References: <8738ewudra.fsf@zancas.localnet>\r
+       <20140623201918.GA7346@jwilk.net> <87ha37fjm3.fsf@zancas.localnet>\r
+       <20140626213100.GA8930@jwilk.net>\r
+User-Agent: Notmuch/0.18.1 (http://notmuchmail.org) Emacs/24.3.1\r
+       (x86_64-pc-linux-gnu)\r
+Date: Fri, 27 Jun 2014 12:45:56 -0300\r
+Message-ID: <878uoifj9n.fsf@zancas.localnet>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain\r
+Cc: notmuch@notmuchmail.org\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: Fri, 27 Jun 2014 15:46:17 -0000\r
+\r
+Jakub Wilk <jwilk@debian.org> writes:\r
+\r
+> * David Bremner <david@tethera.net>, 2014-06-26, 18:26:\r
+>>>0.18.1~rc0-1 is much better, thanks!\r
+>>>\r
+>>>I still get NullPointerError for one of my messages, though. :-( The \r
+>>>message is in the MBOXCL format (where message body size is indicated \r
+>>>by the Content-Length field), and has lines starting with "From " in \r
+>>>the message body. I've attached a new test case.\r
+>>\r
+>>That message (and at a guess other MBOXCL files) is ignored as a \r
+>>non-mail file by 0.18.1 "notmuch new".\r
+>\r
+> Indeed.\r
+>\r
+>>Is this another case of files which where indexed with an older version \r
+>>of notmuch causing problems with a newer version?\r
+>\r
+> Yes, that's why I meant. Sorry for not being clear.\r
+\r
+As a point of information, I bisected with the following test script:\r
+\r
+#!/usr/bin/env bash\r
+test_description='"notmuch new" in several variations'\r
+. ./test-lib.sh\r
+\r
+test_begin_subtest "Support single-message mbox with content length (deprecated)"\r
+cat > "${MAIL_DIR}"/mbox_file2 <<EOF\r
+>From jwilk  Fri May 30 14:09:05 2014\r
+Subject: Hello world!\r
+Content-Length: 12\r
+Lines: 1\r
+\r
+>From world!\r
+\r
+EOF\r
+output=$(NOTMUCH_NEW 2>&1)\r
+test_expect_equal "$output" \\r
+"Added 1 new message to the database."\r
+\r
+\r
+test_done\r
+\r
+The commit where the behaviour changed to reject MBOXCL files with \r
+'From ' in the body was 610f0e09929. This was between 0.14 and 0.15.\r
+I'd say this was unintentional, although it isn't clear to me yet how\r
+easy it is fix.\r
+\r
+\r