From 8a6c421827626bb61e013b4a57cfb6e45f2d4ad7 Mon Sep 17 00:00:00 2001 From: Thomas Oulevey Date: Apr 07 2015 09:54:32 +0000 Subject: - Fix -common inheritance bug -eq instead of -gt - fix typo, -testing -> -candidate --- diff --git a/scripts/create_sig.sh b/scripts/create_sig.sh index 206c8f4..b896b97 100755 --- a/scripts/create_sig.sh +++ b/scripts/create_sig.sh @@ -126,7 +126,7 @@ do do R_SIG="${P_SIG}-${RELEASE}" $KOJI list-tags | grep $R_SIG-candidate &> /dev/null - [ $? -gt 0 ] && echo "Creating tag : ${R_SIG}-candidate" && $KOJI add-tag $R_SIG-testing + [ $? -gt 0 ] && echo "Creating tag : ${R_SIG}-candidate" && $KOJI add-tag $R_SIG-candidate $KOJI list-tags | grep $R_SIG-testing &> /dev/null [ $? -gt 0 ] && echo "Creating tag : ${R_SIG}-testing" && $KOJI add-tag $R_SIG-testing $KOJI list-tags | grep $R_SIG-release &> /dev/null @@ -141,7 +141,7 @@ do TAG="$TAG-$COLLECTIONS" fi $KOJI list-tags | grep $R_SIG-$TAG-build &> /dev/null - [ $? -eq 0 ] && echo " -> $R_SIG-$TAG target already exists. skipping." && continue + [ $? -eq 0 ] && echo " -> $R_SIG-$TAG-build tag already exists. skipping." && continue echo " -> creating $R_SIG-$TAG" $KOJI add-tag --arches "$ARCHES" $R_SIG-$TAG-build $KOJI add-target $R_SIG-$TAG $R_SIG-$TAG-build $R_SIG-candidate @@ -164,7 +164,7 @@ do if [ "x$RELEASE" != "xcommon" ] then $KOJI list-tags | grep $P_SIG-common-candidate &> /dev/null - [ $? -gt 0 ] && echo "Adding $P_SIG-common-candidate as inheritance" && $KOJI add-tag-inheritance --priority 15 $R_SIG-$TAG-build $P_SIG-common-candidate + [ $? -eq 0 ] && echo "Adding $P_SIG-common-candidate as inheritance" && $KOJI add-tag-inheritance --priority 15 $R_SIG-$TAG-build $P_SIG-common-candidate fi $KOJI list-tagged buildsys${DIST} | grep buildsys-macros-$REALTAG &> /dev/null if [ $? -gt 0 ]