diff options
| author | George Joseph <gjoseph@digium.com> | 2016-11-28 10:03:23 -0700 |
|---|---|---|
| committer | George Joseph <gjoseph@digium.com> | 2016-11-28 12:09:48 -0500 |
| commit | 8a682897668d8b0c93a7ba99e59bc773af4c9528 (patch) | |
| tree | 3bd84d45df786bb9829b2f8cdbdea9f047f321b5 /build_tools | |
| parent | acdae08cf789a1d51eac1a148a7a1a259856ab1b (diff) | |
build_tools: Fix download_externals to handle certified branches
download_externals wasn't handling the "certified/13.x" version
correctly.
Change-Id: I124d195bb117ca36fd7bf1150c630f3b474a9d9a
Diffstat (limited to 'build_tools')
| -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." |