[asterisk-commits] build tools: Fix download externals to handle certified bra... (asterisk[certified/13.13])
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Mon Nov 28 17:18:13 CST 2016
Joshua Colp has submitted this change and it was merged. ( https://gerrit.asterisk.org/4506 )
Change subject: build_tools: Fix download_externals to handle certified branches
......................................................................
build_tools: Fix download_externals to handle certified branches
download_externals wasn't handling the "certified/13.x" version
correctly.
Change-Id: I124d195bb117ca36fd7bf1150c630f3b474a9d9a
---
M build_tools/download_externals
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
Mark Michelson: Looks good to me, approved
Anonymous Coward #1000019: Verified
diff --git a/build_tools/download_externals b/build_tools/download_externals
index 2bc357c..d2e2e4f 100755
--- a/build_tools/download_externals
+++ b/build_tools/download_externals
@@ -45,11 +45,11 @@
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."
--
To view, visit https://gerrit.asterisk.org/4506
To unsubscribe, visit https://gerrit.asterisk.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I124d195bb117ca36fd7bf1150c630f3b474a9d9a
Gerrit-PatchSet: 1
Gerrit-Project: asterisk
Gerrit-Branch: certified/13.13
Gerrit-Owner: George Joseph <gjoseph at digium.com>
Gerrit-Reviewer: Anonymous Coward #1000019
Gerrit-Reviewer: Joshua Colp <jcolp at digium.com>
Gerrit-Reviewer: Mark Michelson <mmichelson at digium.com>
More information about the asterisk-commits
mailing list