manuel
/
live-build
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Correcting config tree version check for the current version.

This commit is contained in:
Daniel Baumann 2012-12-17 13:40:28 +01:00
parent 8d69592122
commit f9b415c580
1 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
functions/defaults.sh
View File

@ -1214,20 +1214,24 @@ Check_defaults ()
# except when bootstrapping the functions/defaults etc.).
CURRENT_CONFIG_VERSION="$(echo ${LB_CONFIG_VERSION} | awk -F. '{ print $1 }')"
if [ ${CURRENT_CONFIG_VERSION} -ge 4 ]
if [ ${CURRENT_CONFIG_VERSION} -ne 3 ]
then
Echo_error "This config tree is too new for this version of live-build (${VERSION})."
Echo_error "Aborting build, please get a new version of live-build."
if [ ${CURRENT_CONFIG_VERSION} -ge 4 ]
then
Echo_error "This config tree is too new for this version of live-build (${VERSION})."
Echo_error "Aborting build, please get a new version of live-build."
exit 1
elif [ ${CURRENT_CONFIG_VERSION} -le 2 ]
then
Echo_error "This config tree is too old for this version of live-build (${VERSION})."
Echo_error "Aborting build, please regenerate the config tree."
exit 1
else
Echo_warning "This config tree does not specify a format version or has an unknown version number."
Echo_warning "Continuing build, but it could lead to errors or different results. Please regenerate the config tree."
exit 1
elif [ ${CURRENT_CONFIG_VERSION} -le 2 ]
then
Echo_error "This config tree is too old for this version of live-build (${VERSION})."
Echo_error "Aborting build, please regenerate the config tree."
exit 1
else
Echo_warning "This config tree does not specify a format version or has an unknown version number."
Echo_warning "Continuing build, but it could lead to errors or different results. Please regenerate the config tree."
fi
fi
fi