diff options
author | malayaleecoder <malayaleecoder@gmail.com> | 2016-03-15 22:28:33 +0530 |
---|---|---|
committer | malayaleecoder <malayaleecoder@gmail.com> | 2016-03-16 00:02:15 +0530 |
commit | 4ee331059ddd0185f8a24955e591fd55d426bc38 (patch) | |
tree | 8049d363e63bf780e82d86efc90e4b323b5888d4 /python/servo/bootstrap_commands.py | |
parent | 183772583fcbb1f8103e8d6542a620134ba9182e (diff) | |
download | servo-4ee331059ddd0185f8a24955e591fd55d426bc38.tar.gz servo-4ee331059ddd0185f8a24955e591fd55d426bc38.zip |
Remove submodule update from mach bootstrap. Fixes #10010
Diffstat (limited to 'python/servo/bootstrap_commands.py')
-rw-r--r-- | python/servo/bootstrap_commands.py | 34 |
1 files changed, 1 insertions, 33 deletions
diff --git a/python/servo/bootstrap_commands.py b/python/servo/bootstrap_commands.py index 9be2e84afcc..edd1e84dde0 100644 --- a/python/servo/bootstrap_commands.py +++ b/python/servo/bootstrap_commands.py @@ -15,12 +15,10 @@ import os import os.path as path import re import shutil -import subprocess import sys import StringIO import tarfile import urllib2 -from distutils.version import LooseVersion from mach.decorators import ( CommandArgument, @@ -28,7 +26,7 @@ from mach.decorators import ( Command, ) -from servo.command_base import CommandBase, cd, host_triple, check_call, BIN_SUFFIX +from servo.command_base import CommandBase, host_triple, BIN_SUFFIX def download(desc, src, writer): @@ -280,36 +278,6 @@ class MachCommands(CommandBase): print("Unable to parse chromium HSTS preload list, has the format changed?") sys.exit(1) - @Command('update-submodules', - description='Update submodules', - category='bootstrap') - def update_submodules(self): - # Ensure that the installed git version is >= 1.8.1 - gitversion_output = subprocess.check_output(["git", "--version"]) - gitversion = LooseVersion(gitversion_output.split(" ")[-1]) - if gitversion < LooseVersion("1.8.1"): - print("Git version 1.8.1 or above required. Current version is {}" - .format(gitversion)) - sys.exit(1) - submodules = subprocess.check_output(["git", "submodule", "status"]) - for line in submodules.split('\n'): - components = line.strip().split(' ') - if len(components) > 1: - module_path = components[1] - if path.exists(module_path): - with cd(module_path): - output = subprocess.check_output( - ["git", "status", "--porcelain"]) - if len(output) != 0: - print("error: submodule %s is not clean" - % module_path) - print("\nClean the submodule and try again.") - return 1 - check_call( - ["git", "submodule", "--quiet", "sync", "--recursive"]) - check_call( - ["git", "submodule", "update", "--init", "--recursive"]) - @Command('clean-nightlies', description='Clean unused nightly builds of Rust and Cargo', category='bootstrap') |