From a2c3b40ef05db28a988ce42d64df4a70debea297 Mon Sep 17 00:00:00 2001 From: bp-sawyers Date: Thu, 12 Nov 2009 14:35:24 +0000 Subject: [PATCH] Fix UP=0 logic in build script git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@4553 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- buildcore.sh | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/buildcore.sh b/buildcore.sh index 6e7c83efe..3ffc25c8c 100755 --- a/buildcore.sh +++ b/buildcore.sh @@ -155,19 +155,12 @@ if $GREP -E '^[UAD] +xCAT/' $SVNUP; then mv /usr/src/$pkg/RPMS/*/xCAT-$VER*rpm $DESTDIR fi -# Decide whether to upload or not -if [ -n "$UP" ]; then - if [ $UP == 0 ]; then - exit 0; - fi - #else we will continue -else - if [ $UPLOAD == 0 ]; then - echo "Nothing new detected" - exit 0; - fi - #else we will continue +# Decide if anything was built or not +if [ $UPLOAD == 0 ]; then + echo "Nothing new detected" + exit 0; fi +#else we will continue # Prepare the RPMs for pkging and upload # get gpg keys in place @@ -236,6 +229,12 @@ tar -hjcvf $TARNAME $XCATCORE chgrp xcat $TARNAME chmod g+w $TARNAME +# Decide whether to upload or not +if [ -n "$UP" ] && [ "$UP" == 0 ]; then + exit 0; +fi +#else we will continue + # Upload the individual RPMs to sourceforge if [ ! -e core-snap ]; then ln -s xcat-core core-snap