[prev in list] [next in list] [prev in thread] [next in thread] 

List:       asterisk-commits
Subject:    [asterisk-commits] =?utf-8?q?build_tools=3A__Fix_download_externa?= =?utf-8?q?ls_to_handle_certified
From:       SVN commits to the Asterisk project <asterisk-commits () lists ! digium ! com>
Date:       2016-11-28 23:18:13
Message-ID: mailman.37868.1480451398.1232.asterisk-commits () lists ! digium ! com
[Download RAW message or body]

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@digium.com>
Gerrit-Reviewer: Anonymous Coward #1000019
Gerrit-Reviewer: Joshua Colp <jcolp@digium.com>
Gerrit-Reviewer: Mark Michelson <mmichelson@digium.com>

-- 
_____________________________________________________________________
-- Bandwidth and Colocation Provided by http://www.api-digital.com --

asterisk-commits mailing list
To UNSUBSCRIBE or update options visit:
   http://lists.digium.com/mailman/listinfo/asterisk-commits


[prev in list] [next in list] [prev in thread] [next in thread]