GitList

Browse code

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

Sean Dague authored on 2015/02/20 20:10:48
Showing 2 changed files

lib/stack index 6ca6c0b..9a509d8 100644
stack.sh index 0ec7a5e..6002cf9 100755

lib/stack

History View file @ aa8d31a

@@ -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}

stack.sh

History View file @ aa8d31a

@@ -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