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

Added error handling and improved error messaging when running mach without python's virtualenv or pip installed

Browse source
This commit is contained in:
Anthony Broad-Crawford 2015-09-18 11:45:52 -05:00
parent 8a8204ffc8
commit 2e0e2288ed
1 changed files with 17 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

19
python/mach_bootstrap.py
View file

@ -84,7 +84,14 @@ def _activate_virtualenv(topdir):
if not os.path.exists(virtualenv_path): if not os.path.exists(virtualenv_path):
virtualenv = _get_exec("virtualenv2", "virtualenv") virtualenv = _get_exec("virtualenv2", "virtualenv")
subprocess.check_call([virtualenv, "-p", python, virtualenv_path])
try:
subprocess.check_call([virtualenv, "-p", python, virtualenv_path])
except subprocess.CalledProcessError:
sys.exit("Python virtualenv failed to execute properly.")
except OSError:
sys.exit("Please install virtualenv "
"and ensure permissions prior to running mach.")
activate_path = os.path.join(virtualenv_path, "bin", "activate_this.py") activate_path = os.path.join(virtualenv_path, "bin", "activate_this.py")
execfile(activate_path, dict(__file__=activate_path)) execfile(activate_path, dict(__file__=activate_path))
@ -109,7 +116,15 @@ def _activate_virtualenv(topdir):
continue continue
except OSError: except OSError:
open(marker_path, 'w').close() open(marker_path, 'w').close()
subprocess.check_call(["pip", "install", "-q", "-r", req_path])
try:
subprocess.check_call(["pip", "install", "-q", "-r", req_path])
except subprocess.CalledProcessError:
sys.exit("Pip failed to execute properly.")
except OSError:
sys.exit("Pip not found. Please install pip and verify permissions"
" prior to running mach.")
os.utime(marker_path, None) os.utime(marker_path, None)