openstack
/
devstack
Code Issues Proposed changes

fix missing TOP_DIR which can break sourcing 

There were a couple of places where TOP_DIR is missing when we do a
source of content in tools. Given that working directory can change
quite often during devstack, we need to always be explicit here.

Change-Id: I14b5699637d7f5db745bccf116f440cdcbaa8d91
This commit is contained in:
Sean Dague 2015-02-20 06:10:48 -05:00
parent 86b3a920e9
commit aa8d31ac8b
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/stack
View File

@ -18,7 +18,7 @@ function stack_install_service {
if type install_${service} >/dev/null 2>&1; then
if [[ -n ${PROJECT_VENV[$service]:-} ]]; then
rm -rf ${PROJECT_VENV[$service]}
source tools/build_venv.sh ${PROJECT_VENV[$service]}
source $TOP_DIR/tools/build_venv.sh ${PROJECT_VENV[$service]}
export PIP_VIRTUAL_ENV=${PROJECT_VENV[$service]:-}
fi
install_${service}

2
stack.sh
View File

@ -685,7 +685,7 @@ fi
# Pre-build some problematic wheels
if [[ ! -d ${WHEELHOUSE:-} ]]; then
source tools/build_wheels.sh
source $TOP_DIR/tools/build_wheels.sh
fi