commit c559824c6efe7dcc59cd29a9f7ee648c9733e5a3
author Allen Li <ayatane@chromium.org> Wed Dec 21 11:09:23 2016 -0800
committer chrome-bot <chrome-bot@chromium.org> Thu Dec 22 18:27:35 2016 -0800
tree 03bf956003d7cb692add8f6687ab68882320632f
parent 04b03419dba161d813a4e4664bbb7b32070ea4f6

Use explicit virtualenv in virtualenv_wrapper

BUG=None
TEST=None

Change-Id: I78bf1c945632886bb9aef60f4c1b2a7411f90678
Reviewed-on: https://chromium-review.googlesource.com/422916
Commit-Ready: Allen Li <ayatane@chromium.org>
Tested-by: Allen Li <ayatane@chromium.org>
Reviewed-by: David Riley <davidriley@chromium.org>

scripts/virtualenv_wrapper.py

diff --git a/scripts/virtualenv_wrapper.py b/scripts/virtualenv_wrapper.py
index 15def65..b0e93c6 100755
--- a/scripts/virtualenv_wrapper.py
+++ b/scripts/virtualenv_wrapper.py
@@ -24,12 +24,12 @@
 _CHROMITE_DIR = _FindChromiteDir()
 
 # _VIRTUALENV_DIR contains the scripts for working with venvs
-_VIRTUALENV_DIR = os.path.join(_CHROMITE_DIR, '../infra_virtualenv')
+_VIRTUALENV_DIR = os.path.join(_CHROMITE_DIR, '..', 'infra_virtualenv')
 _CREATE_VENV_PATH = os.path.join(_VIRTUALENV_DIR, 'create_venv')
-_VENV_COMMAND_PATH = os.path.join(_VIRTUALENV_DIR, 'venv_command')
 
 # _VENV_DIR is the virtualenv dir that contains bin/activate.
 _VENV_DIR = os.path.join(_CHROMITE_DIR, '.venv')
+_VENV_PYTHON = os.path.join(_VENV_DIR, 'bin', 'python')
 _REQUIREMENTS = os.path.join(_CHROMITE_DIR, 'venv', 'requirements.txt')
 
 _VENV_MARKER = 'INSIDE_CHROMITE_VENV'
@@ -58,9 +58,10 @@
   Args:
     args: Sequence of arguments.
   """
-  os.execve(_VENV_COMMAND_PATH,
-            [os.path.basename(_VENV_COMMAND_PATH), _VENV_DIR] + list(args),
-            _CreateVenvEnvironment(os.environ))
+  os.execve(
+      _VENV_PYTHON,
+      [_VENV_PYTHON] + list(args),
+      _CreateVenvEnvironment(os.environ))
 
 
 def _CreateVenvEnvironment(env_dict):