From: David Bremner <bremner@debian.org>
Date: Mon, 21 Jan 2013 12:06:51 +0000 (-0400)
Subject: Merge tag 'debian/0.15-2'
X-Git-Tag: 0.16_rc1~229
X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=commitdiff_plain;h=1407901cba742b12931e54765eff819c02aa6764;hp=cbaacad316331a3cb34ca797184e164ca8c468a2

Merge tag 'debian/0.15-2'

debian bug fix release, disable tests
---

diff --git a/devel/release-checks.sh b/devel/release-checks.sh
index e1d19f20..d2bbc6a0 100755
--- a/devel/release-checks.sh
+++ b/devel/release-checks.sh
@@ -53,12 +53,13 @@ fi < ./version
 
 readonly VERSION
 
+# In the rest of this file, tests collect list of errors to be fixed
+
 verfail ()
 {
 	echo No.
-	echo "$@"
-	echo "Please follow the instructions in RELEASING to choose a version"
-	exit 1
+	append_emsg "$@"
+	append_emsg "  Please follow the instructions in RELEASING to choose a version"
 }
 
 echo -n "Checking that '$VERSION' is good with digits and periods... "
@@ -73,8 +74,6 @@ case $VERSION in
 esac
 
 
-# In the rest of this file, tests collect list of errors to be fixed
-
 echo -n "Checking that this is Debian package for notmuch... "
 read deb_notmuch deb_version rest < debian/changelog
 if [ "$deb_notmuch" = 'notmuch' ]
diff --git a/notmuch-tag.c b/notmuch-tag.c
index b54c55dd..d9daf8fb 100644
--- a/notmuch-tag.c
+++ b/notmuch-tag.c
@@ -97,7 +97,7 @@ tag_query (void *ctx, notmuch_database_t *notmuch, const char *query_string,
     notmuch_query_t *query;
     notmuch_messages_t *messages;
     notmuch_message_t *message;
-    int ret = 0;
+    int ret = NOTMUCH_STATUS_SUCCESS;
 
     /* Optimize the query so it excludes messages that already have
      * the specified set of tags. */