[PATCH 1/1] devel/release-checks.sh: version string problem does not halt execution

diff --git a/83/faba0d68b38cb8eecd616aa7f8eeab6b2e7b59 b/83/faba0d68b38cb8eecd616aa7f8eeab6b2e7b59
new file mode 100644 (file)
index 0000000..85658e1
--- /dev/null
+++ b/83/faba0d68b38cb8eecd616aa7f8eeab6b2e7b59
@@ -0,0 +1,87 @@
+Return-Path: <too@guru-group.fi>\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 8472D431FBD\r
+       for <notmuch@notmuchmail.org>; Fri, 18 Jan 2013 18:13:35 -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 tJdU2PRj7Tmz for <notmuch@notmuchmail.org>;\r
+       Fri, 18 Jan 2013 18:13:34 -0800 (PST)\r
+Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34])\r
+       by olra.theworths.org (Postfix) with ESMTP id EE959431FAF\r
+       for <notmuch@notmuchmail.org>; Fri, 18 Jan 2013 18:13:33 -0800 (PST)\r
+Received: by guru.guru-group.fi (Postfix, from userid 501)\r
+       id B12B0100044; Sat, 19 Jan 2013 04:13:21 +0200 (EET)\r
+From: Tomi Ollila <tomi.ollila@iki.fi>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 1/1] devel/release-checks.sh: version string problem does not\r
+       halt execution\r
+Date: Sat, 19 Jan 2013 04:13:17 +0200\r
+Message-Id: <1358561597-4241-1-git-send-email-tomi.ollila@iki.fi>\r
+X-Mailer: git-send-email 1.8.0\r
+Cc: tomi.ollila@iki.fi\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, 19 Jan 2013 02:13:35 -0000\r
+\r
+Version string has strict format requirements in release-check.sh:\r
+only numbers and periods (in sane order) are accepted.\r
+Mismatch there used to halt further execution.\r
+In this case, checking versions like '*~rc1' for (more) problems\r
+was not possible.\r
+This 'fatal error' is now changed buffered error message like in\r
+following tests, and is displayed at the end of execution.\r
+---\r
+ devel/release-checks.sh | 9 ++++-----\r
+ 1 file changed, 4 insertions(+), 5 deletions(-)\r
+\r
+diff --git a/devel/release-checks.sh b/devel/release-checks.sh\r
+index e1d19f2..d2bbc6a 100755\r
+--- a/devel/release-checks.sh\r
++++ b/devel/release-checks.sh\r
+@@ -53,12 +53,13 @@ fi < ./version\r
+ \r
+ readonly VERSION\r
+ \r
++# In the rest of this file, tests collect list of errors to be fixed\r
++\r
+ verfail ()\r
+ {\r
+       echo No.\r
+-      echo "$@"\r
+-      echo "Please follow the instructions in RELEASING to choose a version"\r
+-      exit 1\r
++      append_emsg "$@"\r
++      append_emsg "  Please follow the instructions in RELEASING to choose a version"\r
+ }\r
+ \r
+ echo -n "Checking that '$VERSION' is good with digits and periods... "\r
+@@ -73,8 +74,6 @@ case $VERSION in\r
+ esac\r
+ \r
+ \r
+-# In the rest of this file, tests collect list of errors to be fixed\r
+-\r
+ echo -n "Checking that this is Debian package for notmuch... "\r
+ read deb_notmuch deb_version rest < debian/changelog\r
+ if [ "$deb_notmuch" = 'notmuch' ]\r
+-- \r
+1.8.0.2\r
+\r