[rhq] Branch 'stefan/release_test-test-build' - release.sh
release.sh | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
New commits:
commit 475265f11c504f27f17424b35743eeeb1ea56fdf
Author: Stefan Negrea <snegrea(a)redhat.com>
Date: Fri Sep 30 15:44:55 2011 -0500
Update the code to remove local tags. If the tag is just local that means there were
errors during the build process and the tag was published.
diff --git a/release.sh b/release.sh
index 18cff5d..370cf36 100755
--- a/release.sh
+++ b/release.sh
@@ -295,10 +295,13 @@ then
fi
# See if the specified tag already exists locally - if so, delete it (even if in
production mode).
+# If the tag is just local then there were errors during the last run; no harm in
removing it.
EXISTING_LOCAL_TAG=`git tag -l "$RELEASE_TAG"`
if [ -n "$EXISTING_LOCAL_TAG" ];
then
- abort "A local tag named $RELEASE_TAG already exists - aborting"
+ echo "A local tag named $RELEASE_TAG already exists - deleting it..."
+ git tag -d "$RELEASE_TAG"
+ [ "$?" -ne 0 ] && abort "Failed to delete local tag
($RELEASE_TAG)."
fi
run_tag_version_process