diff options
| author | zuul <zuul@gerrit.asterisk.org> | 2016-11-28 16:07:20 -0600 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2016-11-28 16:07:20 -0600 |
| commit | 350a9a6bd4cadc97700c7dd97c5c603207fe0cf1 (patch) | |
| tree | a8bec549f143c98e02a0d61ccd2d2a884bbd0f54 | |
| parent | 606ab90c25fdbc8fc28d0312cd873731d555a80f (diff) | |
| parent | 8a682897668d8b0c93a7ba99e59bc773af4c9528 (diff) | |
Merge "build_tools: Fix download_externals to handle certified branches"
| -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." |