From 4be356eccbc9c73ef23315b15d00ab5160bbecb8 Mon Sep 17 00:00:00 2001 From: Renato Botelho Date: Mon, 11 Apr 2016 22:38:31 -0300 Subject: Use right repo conf for stage on snaps --- tools/builder_common.sh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'tools/builder_common.sh') diff --git a/tools/builder_common.sh b/tools/builder_common.sh index 531c83b..d0b871d 100644 --- a/tools/builder_common.sh +++ b/tools/builder_common.sh @@ -1539,9 +1539,11 @@ setup_pkg_repo() { fi if [ -n "${_staging}" -a -n "${USE_PKG_REPO_STAGING}" ]; then - _pkg_repo_server=${PKG_REPO_SERVER_STAGING} + local _pkg_repo_server=${PKG_REPO_SERVER_STAGING} + local _pkg_repo_branch=${PKG_REPO_BRANCH_STAGING} else - _pkg_repo_server=${PKG_REPO_SERVER_RELEASE} + local _pkg_repo_server=${PKG_REPO_SERVER_RELEASE} + local _pkg_repo_branch=${PKG_REPO_BRANCH_RELEASE} fi mkdir -p $(dirname ${_target}) >/dev/null 2>&1 @@ -1549,7 +1551,7 @@ setup_pkg_repo() { sed \ -e "s/%%ARCH%%/${_target_arch}/" \ -e "s/%%PKG_REPO_BRANCH_DEVEL%%/${PKG_REPO_BRANCH_DEVEL}/g" \ - -e "s/%%PKG_REPO_BRANCH_RELEASE%%/${PKG_REPO_BRANCH_RELEASE}/g" \ + -e "s/%%PKG_REPO_BRANCH_RELEASE%%/${_pkg_repo_branch}/g" \ -e "s,%%PKG_REPO_SERVER_DEVEL%%,${PKG_REPO_SERVER_DEVEL},g" \ -e "s,%%PKG_REPO_SERVER_RELEASE%%,${_pkg_repo_server},g" \ -e "s/%%PRODUCT_NAME%%/${PRODUCT_NAME}/g" \ -- cgit v1.1