diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-02-07 09:07:33 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-02-07 09:07:33 +0000 |
| commit | 3fd1c63e37436eaf4621df62f112ae1886d238cc (patch) | |
| tree | d3ae5d09ae05862040a4cffe2115433751af76a0 | |
| parent | 20ecfb00be9b979d83a4ea95b09f9f284722b353 (diff) | |
| parent | cacc8ff92d13482bce6049986fb2035ef05fa973 (diff) | |
| download | nova-3fd1c63e37436eaf4621df62f112ae1886d238cc.tar.gz nova-3fd1c63e37436eaf4621df62f112ae1886d238cc.tar.xz nova-3fd1c63e37436eaf4621df62f112ae1886d238cc.zip | |
Merge "Sync latest install_venv_common from oslo."
| -rw-r--r-- | tools/install_venv.py | 3 | ||||
| -rw-r--r-- | tools/install_venv_common.py | 7 |
2 files changed, 7 insertions, 3 deletions
diff --git a/tools/install_venv.py b/tools/install_venv.py index 60f4894ed..abf56ea0e 100644 --- a/tools/install_venv.py +++ b/tools/install_venv.py @@ -22,9 +22,6 @@ import os import sys -parentdir = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) -os.sys.path.insert(0, parentdir) - import install_venv_common as install_venv diff --git a/tools/install_venv_common.py b/tools/install_venv_common.py index b15011a00..3d47b12b2 100644 --- a/tools/install_venv_common.py +++ b/tools/install_venv_common.py @@ -25,6 +25,13 @@ import os import subprocess import sys + +possible_topdir = os.getcwd() +if os.path.exists(os.path.join(possible_topdir, "nova", + "__init__.py")): + sys.path.insert(0, possible_topdir) + + from nova.openstack.common import cfg |