Merge "build_tools: Fix download_externals to handle certified branches"

This commit is contained in:
zuul
2016-11-28 16:07:20 -06:00
committed by Gerrit Code Review

View File

@@ -45,11 +45,11 @@ if [[ -z ${cache_dir} ]] ; then
fi
version=$(${ASTTOPDIR}/build_tools/make_version ${ASTTOPDIR})
if [[ ! ${version} =~ ^(GIT-)?([^.-]+)[.-].* ]] ; then
if [[ ! ${version} =~ ^(GIT-)?(certified/)?([^.-]+)[.-].* ]] ; then
echo "${module_name}: Couldn't parse version ${version}"
exit 1
fi
major_version=${BASH_REMATCH[2]}
major_version=${BASH_REMATCH[3]}
if [[ "${major_version}" == "master" ]] ; then
echo "${module_name}: External module downloading is not available in the 'master' git branch. Please disable in menuselect and download manually."