launchpad-reviewers team mailing list archive

[Colin Watson <mp+409681@xxxxxxxxxxxxxxxxxx>]

Colin Watson has proposed merging ~cjwatson/launchpad:hardcode-virtualenv-path into launchpad:master.

Commit message:
Hardcode /usr/bin/virtualenv path

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~cjwatson/launchpad/+git/launchpad/+merge/409681

Some people may have a local virtualenv installation elsewhere on `$PATH`, which is unlikely to work properly in a Launchpad container.  I'm normally reluctant to hardcode paths, but this seems like a reasonable case for it.
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~cjwatson/launchpad:hardcode-virtualenv-path into launchpad:master.

diff --git a/Makefile b/Makefile
index ffaa831..b2daade 100644
--- a/Makefile
+++ b/Makefile
@@ -25,7 +25,7 @@ PIP_NO_INDEX := 1
 PIP_ENV += PIP_NO_INDEX=$(PIP_NO_INDEX)
 PIP_ENV += PIP_FIND_LINKS="file://$(WD)/wheels/ file://$(WD)/download-cache/dist/"
 
-VIRTUALENV := $(PIP_ENV) virtualenv
+VIRTUALENV := $(PIP_ENV) /usr/bin/virtualenv
 PIP := PYTHONPATH= $(PIP_ENV) env/bin/pip --cache-dir=$(WD)/download-cache/
 
 VENV_PYTHON := env/bin/$(PYTHON)