Re: [PATCH 3/3] notmuch-show: detect xapian exception in query

diff --git a/61/229801f878b3fa90b8b11cbfb4149cac2e6886 b/61/229801f878b3fa90b8b11cbfb4149cac2e6886
new file mode 100644 (file)
index 0000000..7c4fc40
--- /dev/null
+++ b/61/229801f878b3fa90b8b11cbfb4149cac2e6886
@@ -0,0 +1,66 @@
+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 16040431FBC\r
+       for <notmuch@notmuchmail.org>; Fri, 24 Jan 2014 16:42:14 -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 3F9z5P2azsbN for <notmuch@notmuchmail.org>;\r
+       Fri, 24 Jan 2014 16:42:06 -0800 (PST)\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 CFFB4431FB6\r
+       for <notmuch@notmuchmail.org>; Fri, 24 Jan 2014 16:42:06 -0800 (PST)\r
+Received: from remotemail by yantan.tethera.net with local (Exim 4.80)\r
+       (envelope-from <david@tethera.net>)\r
+       id 1W6rJx-0006uc-Di; Fri, 24 Jan 2014 20:42:01 -0400\r
+Received: (nullmailer pid 31424 invoked by uid 1000); Sat, 25 Jan 2014\r
+       00:41:57 -0000\r
+From: David Bremner <david@tethera.net>\r
+To: Jani Nikula <jani@nikula.org>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH 3/3] notmuch-show: detect xapian exception in query\r
+In-Reply-To: <87txctf5ip.fsf@nikula.org>\r
+References: <m2r47zrkkc.fsf@guru.guru-group.fi>\r
+       <1390479841-17045-1-git-send-email-david@tethera.net>\r
+       <1390479841-17045-4-git-send-email-david@tethera.net>\r
+       <87txctf5ip.fsf@nikula.org>\r
+User-Agent: Notmuch/0.17+35~g3b36898 (http://notmuchmail.org) Emacs/24.3.1\r
+       (x86_64-pc-linux-gnu)\r
+Date: Fri, 24 Jan 2014 20:41:57 -0400\r
+Message-ID: <87zjmkopt6.fsf@zancas.localnet>\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: Sat, 25 Jan 2014 00:42:14 -0000\r
+\r
+Jani Nikula <jani@nikula.org> writes:\r
+>\r
+> This should just return 1 or something. See how the function eventually\r
+> returns res != NOTMUCH_STATUS_SUCCESS instead of notmuch_status_t. And\r
+> threads == NULL is not guaranteed to mean an exception occurred anyway.\r
+>\r
+> Otherwise the patch LGTM, and is in line with the error handling in\r
+> notmuch search, which does not segfault on similar queries.\r
+\r
+pushed a version amended as suggested.\r
+\r
+d\r