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