Skip to content

Commit

Permalink
Mach now shows stderr when a virtualenv or pip call fails (fixes #11055)
Browse files Browse the repository at this point in the history
  • Loading branch information
autrilla committed May 7, 2016
1 parent a09b237 commit 0fff10c
Showing 1 changed file with 16 additions and 8 deletions.
24 changes: 16 additions & 8 deletions python/mach_bootstrap.py
Expand Up @@ -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)))

Expand Down Expand Up @@ -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()

Expand Down

0 comments on commit 0fff10c

Please sign in to comment.