Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-06 16:45:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #10618 - zwn:fix-windows-build, r=larsbergstrom

Browse source 
Ensure virtualenv activates

Fixes #10595. For more info see #10595 or the commit message.

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/10618)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2016-07-17 15:58:12 -07:00 • committed by GitHub
commit e7a55ae55e
1 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
python/mach_bootstrap.py
View file

@ -9,7 +9,6 @@ import platform
import subprocess
import sys
from distutils.spawn import find_executable
from pipes import quote
SEARCH_PATHS = [
os.path.join("python", "tidy"),
@ -121,7 +120,11 @@ def _activate_virtualenv(topdir):
sys.exit("Python virtualenv failed to execute properly: {}"
.format(process.communicate()[1]))
execfile(activate_path, dict(__file__=quote(activate_path)))
execfile(activate_path, dict(__file__=activate_path))
python = find_executable("python")
if python is None or not python.startswith(virtualenv_path):
sys.exit("Python virtualenv failed to activate.")
# TODO: Right now, we iteratively install all the requirements by invoking
# `pip install` each time. If it were the case that there were conflicting