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

Mach now shows stderr when a virtualenv or pip call fails (fixes #11055)

Browse source
This commit is contained in:
Adrian Utrilla 2016-05-07 17:36:27 +02:00
parent a09b2374f9
commit 0fff10c7e9
No known key found for this signature in database
GPG key ID: 0B30B0FE149E7525
1 changed files with 16 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

24
python/mach_bootstrap.py
View file

@ -106,10 +106,14 @@ def _activate_virtualenv(topdir):
if virtualenv is None:
sys.exit("Python virtualenv is not installed. Please install it prior to running mach.")
try:
subprocess.check_call([virtualenv, "-p", python, virtualenv_path])
except (subprocess.CalledProcessError, OSError):
sys.exit("Python virtualenv failed to execute properly.")
process = subprocess.Popen(
[virtualenv, "-p", python, virtualenv_path],
stdout=subprocess.PIPE,
stderr=subprocess.PIPE)
process.wait()
if process.returncode:
sys.exit("Python virtualenv failed to execute properly: {}"
.format(process.communicate()[1]))
execfile(activate_path, dict(__file__=quote(activate_path)))
@ -138,10 +142,14 @@ def _activate_virtualenv(topdir):
if pip is None:
sys.exit("Python pip is not installed. Please install it prior to running mach.")
try:
subprocess.check_call([pip, "install", "-q", "-r", req_path])
except (subprocess.CalledProcessError, OSError):
sys.exit("Pip failed to execute properly.")
process = subprocess.Popen(
[pip, "install", "-q", "-r", req_path],
stdout=subprocess.PIPE,
stderr=subprocess.PIPE)
process.wait()
if process.returncode:
sys.exit("Pip failed to execute properly: {}"
.format(process.communicate()[1]))
open(marker_path, 'w').close()