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 e1d19f20effa32b08425106fcb81ac1618db773b..d2bbc6a06d077f7f57c6bab8713fc6f30e55bf02 100755 (executable)
--- 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 b54c55dd71428ebca229f6135d57a78e109f8e00..d9daf8fbe44a39f50ba2464cb6a057cfe372afc1 100644 (file)
--- 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. */