diff options
author | Simon Sapin <simon.sapin@exyr.org> | 2014-09-26 13:52:53 +0100 |
---|---|---|
committer | Simon Sapin <simon.sapin@exyr.org> | 2014-09-26 23:12:51 +0100 |
commit | cd45258bf387be2c07f35b87737b5e46e27f14b3 (patch) | |
tree | 28180c4d0d1767409f474153430e78a11e929a83 /python/servo/bootstrap_commands.py | |
parent | ab17d31bbf8c6884f858381f3d5b7e62c4de87c6 (diff) | |
download | servo-cd45258bf387be2c07f35b87737b5e46e27f14b3.tar.gz servo-cd45258bf387be2c07f35b87737b5e46e27f14b3.zip |
Fix /python/servo code formatting.
(My editor screams at me for flake8 lint errors.)
Diffstat (limited to 'python/servo/bootstrap_commands.py')
-rw-r--r-- | python/servo/bootstrap_commands.py | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/python/servo/bootstrap_commands.py b/python/servo/bootstrap_commands.py index bf83803afac..1d682adb7f5 100644 --- a/python/servo/bootstrap_commands.py +++ b/python/servo/bootstrap_commands.py @@ -16,6 +16,7 @@ from mach.decorators import ( from servo.command_base import CommandBase, cd + def host_triple(): os_type = subprocess.check_output(["uname", "-s"]).strip().lower() if os_type == "linux": @@ -39,8 +40,10 @@ def host_triple(): return "%s-%s" % (cpu_type, os_type) + def download(desc, src, dst): recved = [0] + def report(count, bsize, fsize): recved[0] += bsize pct = recved[0] * 100.0 / fsize @@ -53,6 +56,7 @@ def download(desc, src, dst): if not dumb: print() + def extract(src, dst, movedir=None): tarfile.open(src).extractall(dst) @@ -65,6 +69,7 @@ def extract(src, dst, movedir=None): os.remove(src) + @CommandProvider class MachCommands(CommandBase): @Command('env', @@ -95,7 +100,8 @@ class MachCommands(CommandBase): shutil.rmtree(rust_dir) os.mkdir(rust_dir) - snapshot_hash = open(path.join(self.context.topdir, "rust-snapshot-hash")).read().strip() + filename = path.join(self.context.topdir, "rust-snapshot-hash") + snapshot_hash = open(filename).read().strip() snapshot_path = "%s-%s.tar.gz" % (snapshot_hash, host_triple()) snapshot_url = "https://servo-rust.s3.amazonaws.com/%s" % snapshot_path tgz_file = path.join(rust_dir, path.basename(snapshot_path)) @@ -147,10 +153,14 @@ class MachCommands(CommandBase): module_path = components[1] if path.exists(module_path): with cd(module_path): - output = subprocess.check_output(["git", "status", "--porcelain"]) + output = subprocess.check_output( + ["git", "status", "--porcelain"]) if len(output) != 0: - print("error: submodule %s is not clean" % module_path) + print("error: submodule %s is not clean" + % module_path) print("\nClean the submodule and try again.") return 1 - subprocess.check_call(["git", "submodule", "--quiet", "sync", "--recursive"]) - subprocess.check_call(["git", "submodule", "update", "--init", "--recursive"]) + subprocess.check_call( + ["git", "submodule", "--quiet", "sync", "--recursive"]) + subprocess.check_call( + ["git", "submodule", "update", "--init", "--recursive"]) |