diff options
| author | Mark Michelson <mmichelson@digium.com> | 2016-11-28 14:44:28 -0600 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2016-11-28 14:44:28 -0600 |
| commit | 2bae7f4ed9303a4d8565bc861452fd342440ec41 (patch) | |
| tree | 5d494194b785c0d7eca455e344f17b44fbccf3a9 | |
| parent | e6ecbdf001685d99aa50fabc2baba728362270b1 (diff) | |
| parent | 29e887e9e11d3a60ebc0f177ba3dcddb2e07e8fe (diff) | |
Merge "build_tools: Fix download_externals to handle certified branches" into 13
| -rwxr-xr-x | build_tools/download_externals | 4 |
1 files 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." |