[PATCH] emacs: hello: make --batch error gracefully

Subject: [PATCH] emacs: hello: make --batch error gracefully

Date: Thu, 4 Jul 2013 23:18:19 +0100

To: notmuch@notmuchmail.org

Cc:

From: Mark Walters


Recently notmuch-hello was converted to use batch count. However, it
seems that several people run different versions of notmuch-emacs and
notmuch-cli so this batch makes emacs fail with an error message if
--batch is not available in the CLI.
---
There have been two cases on irc of people getting backtraces when
hitting this problem so it might be worth adding an informative error
message.

Best wishes

Mark

 emacs/notmuch-hello.el |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/emacs/notmuch-hello.el b/emacs/notmuch-hello.el
index 147c08c..fa46b7a 100644
--- a/emacs/notmuch-hello.el
+++ b/emacs/notmuch-hello.el
@@ -402,8 +402,13 @@ options will be handled as specified for
 					   (plist-get options :filter)))
 	 "\n")))
 
-    (call-process-region (point-min) (point-max) notmuch-command
-			 t t nil "count" "--batch")
+    (unless (= (call-process-region (point-min) (point-max) notmuch-command
+				    t t nil "count" "--batch") 0)
+      (notmuch-logged-error "notmuch CLI version mismatch error (count --batch)
+The most likely cause of this error is that the CLI is too old
+to support count --batch and needs to be upgraded to the same
+version as notmuch-emacs"))
+
     (goto-char (point-min))
 
     (notmuch-remove-if-not
-- 
1.7.9.1


Thread: