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_bootstrap: Don't get confused by interrupts

Browse source 
When mach_bootstrap got interrupted while it's setting up virtualenv or
calling out to pip, it wouldn't repeat that step on subsequent runs, and
mach fails because its environment isn't set up properly or dependencies
are missing.

So now we re-run virtualenv if activate_this.py doesn't exist, and only
create the marker file for required packages after pip has returned
successfully.
This commit is contained in:
Benjamin Herr 2015-11-05 21:01:04 +01:00
parent 8b030c5177
commit a4fa004c39
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
python/mach_bootstrap.py
View file

@ -91,7 +91,8 @@ def _activate_virtualenv(topdir):
if python is None:
sys.exit("Python is not installed. Please install it prior to running mach.")
if not os.path.exists(virtualenv_path):
activate_path = os.path.join(virtualenv_path, "bin", "activate_this.py")
if not (os.path.exists(virtualenv_path) and os.path.exists(activate_path)):
virtualenv = _get_exec(*VIRTUALENV_NAMES)
if virtualenv is None:
sys.exit("Python virtualenv is not installed. Please install it prior to running mach.")
@ -101,7 +102,6 @@ def _activate_virtualenv(topdir):
except (subprocess.CalledProcessError, OSError):
sys.exit("Python virtualenv failed to execute properly.")
activate_path = os.path.join(virtualenv_path, "bin", "activate_this.py")
execfile(activate_path, dict(__file__=activate_path))
# TODO: Right now, we iteratively install all the requirements by invoking
@ -123,7 +123,7 @@ def _activate_virtualenv(topdir):
if os.path.getmtime(req_path) + 10 < os.path.getmtime(marker_path):
continue
except OSError:
open(marker_path, 'w').close()
pass
pip = _get_exec(*PIP_NAMES)
if pip is None:
@ -134,7 +134,7 @@ def _activate_virtualenv(topdir):
except (subprocess.CalledProcessError, OSError):
sys.exit("Pip failed to execute properly.")
os.utime(marker_path, None)
open(marker_path, 'w').close()
def bootstrap(topdir):