Return-Path: X-Original-To: notmuch@notmuchmail.org Delivered-To: notmuch@notmuchmail.org Received: from localhost (localhost [127.0.0.1]) by olra.theworths.org (Postfix) with ESMTP id 8472D431FBD for ; Fri, 18 Jan 2013 18:13:35 -0800 (PST) X-Virus-Scanned: Debian amavisd-new at olra.theworths.org X-Spam-Flag: NO X-Spam-Score: 0 X-Spam-Level: X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none] autolearn=disabled Received: from olra.theworths.org ([127.0.0.1]) by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id tJdU2PRj7Tmz for ; Fri, 18 Jan 2013 18:13:34 -0800 (PST) Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34]) by olra.theworths.org (Postfix) with ESMTP id EE959431FAF for ; Fri, 18 Jan 2013 18:13:33 -0800 (PST) Received: by guru.guru-group.fi (Postfix, from userid 501) id B12B0100044; Sat, 19 Jan 2013 04:13:21 +0200 (EET) From: Tomi Ollila To: notmuch@notmuchmail.org Subject: [PATCH 1/1] devel/release-checks.sh: version string problem does not halt execution Date: Sat, 19 Jan 2013 04:13:17 +0200 Message-Id: <1358561597-4241-1-git-send-email-tomi.ollila@iki.fi> X-Mailer: git-send-email 1.8.0 Cc: tomi.ollila@iki.fi X-BeenThere: notmuch@notmuchmail.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 19 Jan 2013 02:13:35 -0000 Version string has strict format requirements in release-check.sh: only numbers and periods (in sane order) are accepted. Mismatch there used to halt further execution. In this case, checking versions like '*~rc1' for (more) problems was not possible. This 'fatal error' is now changed buffered error message like in following tests, and is displayed at the end of execution. --- devel/release-checks.sh | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/devel/release-checks.sh b/devel/release-checks.sh index e1d19f2..d2bbc6a 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' ] -- 1.8.0.2