From 282f00b0c92a6d6564be0593fd820207ecba615a Mon Sep 17 00:00:00 2001 From: stuartw Date: Mon, 16 Jul 2012 15:17:11 +0100 Subject: [PATCH] Fix broken buildrelease script --- bin/buildrelease.sh | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/bin/buildrelease.sh b/bin/buildrelease.sh index 4df8c0762d633..2a37abf98f757 100755 --- a/bin/buildrelease.sh +++ b/bin/buildrelease.sh @@ -45,11 +45,6 @@ echo "Building new release of WMCore $VERSION on ${GITBRANCH}" if ! echo ${GITBRANCH} | egrep -iq 'master|wmcore_' ; then echo "ABORTING - Can only release from master or a WMCORE_X_Y_Z git checkout: ${GITBRANCH}" - exit 5 -fi - -if ! echo ${GITBRANCH} | egrep -iq 'master|wmcore_' ; then - echo "ABORTING - Can only release from master or a wmcore_X_Y_Z branch: ${BRANCH}" exit 4 fi @@ -66,8 +61,7 @@ if [ X$(git rev-parse --show-toplevel) != X$PWD ]; then fi # Check if tag exists -git show-ref --verify --quiet -- "refs/tags/${VERSION}" -if [ $? -eq 0 ]; then +if git show-ref --verify --quiet -- "refs/tags/${VERSION}"; then echo "Tag $VERSION exists, skipping tag command" TAG=false fi