[PATCH] emacs: poll: return useful errors when poll fails.

diff --git a/d5/488cbedbc244ce39f6d8e6c5dac33af9a6a9e0 b/d5/488cbedbc244ce39f6d8e6c5dac33af9a6a9e0
new file mode 100644 (file)
index 0000000..af05d91
--- /dev/null
+++ b/d5/488cbedbc244ce39f6d8e6c5dac33af9a6a9e0
@@ -0,0 +1,113 @@
+Return-Path: <markwalters1009@gmail.com>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+ by arlo.cworth.org (Postfix) with ESMTP id 0BE4A6DE17EE\r
+ for <notmuch@notmuchmail.org>; Wed, 28 Oct 2015 11:28:55 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at cworth.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.907\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.907 tagged_above=-999 required=5\r
+ tests=[AWL=-0.337, DKIM_SIGNED=0.1, DKIM_VALID=-0.1,\r
+ DKIM_VALID_AU=-0.1, FREEMAIL_ENVFROM_END_DIGIT=0.25,\r
+ FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=-0.01,\r
+ RCVD_IN_MSPIKE_WL=-0.01, SPF_PASS=-0.001] autolearn=disabled\r
+Received: from arlo.cworth.org ([127.0.0.1])\r
+ by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024)\r
+ with ESMTP id GnnHZlPOcndE for <notmuch@notmuchmail.org>;\r
+ Wed, 28 Oct 2015 11:28:53 -0700 (PDT)\r
+Received: from mail-wi0-f178.google.com (mail-wi0-f178.google.com\r
+ [209.85.212.178])\r
+ by arlo.cworth.org (Postfix) with ESMTPS id D1D726DE0C11\r
+ for <notmuch@notmuchmail.org>; Wed, 28 Oct 2015 11:28:52 -0700 (PDT)\r
+Received: by wijp11 with SMTP id p11so266187750wij.0\r
+ for <notmuch@notmuchmail.org>; Wed, 28 Oct 2015 11:28:46 -0700 (PDT)\r
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;\r
+ h=from:to:cc:subject:date:message-id:in-reply-to:references;\r
+ bh=7CDeicInkt/bhzEFrlI2DDbqPn8Q4iCX7KncKQ8iPXk=;\r
+ b=DdARa3CnzezO/1/3tbcSrmacEP0EoVHuNdjv0UUriVfKZr6jKva2dnRgj5C75Yj0mW\r
+ TT5lnorf7S5S052eLrGkCMeqDXc/eScf35N96/mqWDkH1s0CmIRAk4o3BOIxoBAUKRdw\r
+ CbjLOy0wk5sfv4ocBOqjshPGmkKf5YO+CPdIZf28mtgp/OHFGo/xTL/dCKHtt4OncuBj\r
+ xuS+InAFi5BAhRdqoXZggdcRGk4i/D74lv6XalYrL/yR1XW39lPPzNoKGlmHvk3iIMqJ\r
+ S6XpGqUhHEBsGMixf5EwfKGr2WsSfHvf0q9gh4vQqlz6k495djPjoCc1TNcMFekRL6UQ\r
+ QhnA==\r
+X-Received: by 10.194.122.42 with SMTP id lp10mr41035957wjb.51.1446056926162; \r
+ Wed, 28 Oct 2015 11:28:46 -0700 (PDT)\r
+Received: from localhost (188.29.75.230.threembb.co.uk. [188.29.75.230])\r
+ by smtp.gmail.com with ESMTPSA id p4sm1384840wif.22.2015.10.28.11.28.44\r
+ (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\r
+ Wed, 28 Oct 2015 11:28:45 -0700 (PDT)\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: notmuch@notmuchmail.org,\r
+       ketil@malde.org\r
+Subject: [PATCH] emacs: poll: return useful errors when poll fails.\r
+Date: Wed, 28 Oct 2015 18:28:39 +0000\r
+Message-Id: <1446056919-27822-1-git-send-email-markwalters1009@gmail.com>\r
+X-Mailer: git-send-email 2.1.4\r
+In-Reply-To: <87bnd5qjnd.fsf@wespe.malde.org>\r
+References: <87bnd5qjnd.fsf@wespe.malde.org>\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.20\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+ <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <https://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: <https://notmuchmail.org/mailman/listinfo/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Wed, 28 Oct 2015 18:28:55 -0000\r
+\r
+Previously poll called from emacs would fail silently. This makes it\r
+return a useful error message.\r
+\r
+In the non-deprecated case of notmuch new and appropriate hooks, it\r
+uses notmuch-call-notmuch-process which gives an error and\r
+additionally puts the stdout/stderr etc in the *Notmuch errors*\r
+buffer.\r
+\r
+In the deprecated case of a custom poll script it only returns an\r
+error message.\r
+\r
+Commit based on a bug report, and a potential fix, by Ketil Malde.\r
+---\r
+\r
+This should fix the bug reported in the parent message -- we should\r
+definitely report error messages. It might be nice to output the\r
+stdout/stderr in the custom poll script case but since we don't have\r
+built in infrastructure for it it probably isn't worth it for a\r
+deprecated case.\r
+\r
+(Note I don't use poll, so this is not heavily tested)\r
+\r
+Best wishes\r
+\r
+Mark\r
+\r
+\r
+\r
+ emacs/notmuch-lib.el | 5 +++--\r
+ 1 file changed, 3 insertions(+), 2 deletions(-)\r
+\r
+diff --git a/emacs/notmuch-lib.el b/emacs/notmuch-lib.el\r
+index 1c3a9fe..89c01a5 100644\r
+--- a/emacs/notmuch-lib.el\r
++++ b/emacs/notmuch-lib.el\r
+@@ -243,8 +243,9 @@ depending on the value of `notmuch-poll-script'."\r
+   (interactive)\r
+   (if (stringp notmuch-poll-script)\r
+       (unless (string= notmuch-poll-script "")\r
+-      (call-process notmuch-poll-script nil nil))\r
+-    (call-process notmuch-command nil nil nil "new")))\r
++      (unless (equal (call-process notmuch-poll-script nil nil) 0)\r
++        (error "Notmuch: poll script `%s' failed!" notmuch-poll-script)))\r
++    (notmuch-call-notmuch-process "new")))\r
+ \r
+ (defun notmuch-bury-or-kill-this-buffer ()\r
+   "Undisplay the current buffer.\r
+-- \r
+2.1.4\r
+\r