diff options
| author | ghanshyam <ghanshyam.mann@nectechnologies.in> | 2015-07-08 17:01:17 +0900 |
|---|---|---|
| committer | ghanshyam <ghanshyam.mann@nectechnologies.in> | 2015-07-08 17:04:14 +0900 |
| commit | df257cdff34b79b2e9687e2ed34f2958f1d0740c (patch) | |
| tree | a2451ec94d88576a6dcdc6ff2ed38b21dba3d199 | |
| parent | d9b6280cee824fd9d3ad8766c034c7bfbce2130b (diff) | |
| download | oslo-incubator-df257cdff34b79b2e9687e2ed34f2958f1d0740c.tar.gz | |
Fix couple of env variable usage issues in venv scripts
There are couple of issues in scripts which are responsible for
creating virtual environment.
Issues are listed in bug#1472509.
This patch fix those issues.
Change-Id: I1902377c078342484cf01428660bb1b36eac1552
Closes-Bug: 1472509
| -rw-r--r-- | tools/install_venv.py | 4 | ||||
| -rwxr-xr-x | tools/run_tests_common.sh | 3 | ||||
| -rwxr-xr-x | tools/with_venv.sh | 5 |
3 files changed, 5 insertions, 7 deletions
diff --git a/tools/install_venv.py b/tools/install_venv.py index 42b155fb..452b8bd6 100644 --- a/tools/install_venv.py +++ b/tools/install_venv.py @@ -48,8 +48,8 @@ def print_help(venv, root): def main(argv): root = os.path.dirname(os.path.dirname(os.path.realpath(__file__))) - if os.environ.get('tools_path'): - root = os.environ['tools_path'] + if os.environ.get('TOOLS_PATH'): + root = os.environ['TOOLS_PATH'] venv = os.path.join(root, '.venv') if os.environ.get('VENV'): venv = os.environ['VENV'] diff --git a/tools/run_tests_common.sh b/tools/run_tests_common.sh index 42fdbe32..7b790e6b 100755 --- a/tools/run_tests_common.sh +++ b/tools/run_tests_common.sh @@ -72,7 +72,7 @@ function process_options { TOOLS_PATH=${TOOLS_PATH:-${PWD}} VENV_PATH=${VENV_PATH:-${PWD}} -VENV_DIR=${VENV_NAME:-.venv} +VENV_DIR=${VENV_DIR:-.venv} WITH_VENV=${TOOLS_PATH}/tools/with_venv.sh ALWAYS_VENV=0 @@ -99,7 +99,6 @@ process_options $@ export VENV_PATH export TOOLS_PATH export VENV_DIR -export VENV_NAME export WITH_VENV export VENV=${VENV_PATH}/${VENV_DIR} diff --git a/tools/with_venv.sh b/tools/with_venv.sh index 7303990b..165c883a 100755 --- a/tools/with_venv.sh +++ b/tools/with_venv.sh @@ -1,7 +1,6 @@ #!/bin/bash -TOOLS_PATH=${TOOLS_PATH:-$(dirname $0)} +TOOLS_PATH=${TOOLS_PATH:-$(dirname $0)/../} VENV_PATH=${VENV_PATH:-${TOOLS_PATH}} -VENV_DIR=${VENV_NAME:-/../.venv} -TOOLS=${TOOLS_PATH} +VENV_DIR=${VENV_DIR:-/.venv} VENV=${VENV:-${VENV_PATH}/${VENV_DIR}} source ${VENV}/bin/activate && "$@" |