Commit fdb9aea2 authored by Vitaly Lipatov's avatar Vitaly Lipatov

functions/alt: improve release checking (failed on release number more than 9)

parent daebbb20
...@@ -98,10 +98,10 @@ pkg_release_check() ...@@ -98,10 +98,10 @@ pkg_release_check()
local STRELDEF=alt local STRELDEF=alt
# can be set from korinf config # can be set from korinf config
[ -z "$KORINFTARGETRELEASE" ] || STREL=$KORINFTARGETRELEASE [ -z "$KORINFTARGETRELEASE" ] || STREL=$KORINFTARGETRELEASE
# FIXME! broken for release more than 9
if [ "$MENV" = "SS" ] || [ "$MENV" = "DD" ] ; then if [ "$MENV" = "SS" ] || [ "$MENV" = "DD" ] ; then
for i in $@ ; do for i in $@ ; do
if [ -z "${i/*$STREL[0-9].M[0-9][0-9]*/}" ] && [ -z "${i/*$STRELDEF[0-9].M[0-9][0-9]*/}" ] ; then if rhas "$i" "($STREL|$STRELDEF)[0-9]+\.M[0-9][0-9]\.[0-9]+" ; then
# Значит не тот релиз # Значит не тот релиз
fatal "Incorrect release in $i package: was prepared for Sisyphus" fatal "Incorrect release in $i package: was prepared for Sisyphus"
fi fi
...@@ -109,7 +109,7 @@ pkg_release_check() ...@@ -109,7 +109,7 @@ pkg_release_check()
return return
fi fi
for i in $@ ; do for i in $@ ; do
if [ -n "${i/*$STREL[0-9].$MENV*/}" ] && [ -n "${i/*$STRELDEF[0-9].$MENV*/}" ] ; then if ! rhas "$i" "($STREL|$STRELDEF)[0-9]+\.$MENV\.[0-9]+" ; then
# Значит не тот релиз # Значит не тот релиз
fatal "Incorrect release in $i package: was prepared for $MENV (wait for $STREL[0-9].$MENV)" fatal "Incorrect release in $i package: was prepared for $MENV (wait for $STREL[0-9].$MENV)"
fi fi
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment