From 29e887e9e11d3a60ebc0f177ba3dcddb2e07e8fe Mon Sep 17 00:00:00 2001 From: George Joseph Date: Mon, 28 Nov 2016 10:03:23 -0700 Subject: build_tools: Fix download_externals to handle certified branches download_externals wasn't handling the "certified/13.x" version correctly. Change-Id: I124d195bb117ca36fd7bf1150c630f3b474a9d9a --- build_tools/download_externals | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build_tools/download_externals b/build_tools/download_externals index 2bc357c29..d2e2e4fff 100755 --- a/build_tools/download_externals +++ b/build_tools/download_externals @@ -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." -- cgit v1.2.3