aboutsummaryrefslogtreecommitdiffstats
path: root/python/servo/bootstrap_commands.py
diff options
context:
space:
mode:
authorMs2ger <ms2ger@gmail.com>2015-03-11 11:08:57 +0100
committerJosh Matthews <josh@joshmatthews.net>2015-03-18 13:18:31 -0400
commit5f15eb5fbfb7a8649132cc8b3a07314389836714 (patch)
treecc36210329cb1a31709a03685c05c4aaa99407e3 /python/servo/bootstrap_commands.py
parent65d4b12bf20783ea784f1c61f4b33ec0fc975f4f (diff)
downloadservo-5f15eb5fbfb7a8649132cc8b3a07314389836714.tar.gz
servo-5f15eb5fbfb7a8649132cc8b3a07314389836714.zip
Upgrade rustc to d3c49d2140fc65e8bb7d7cf25bfe74dda6ce5ecf/rustc-1.0.0-dev.
Diffstat (limited to 'python/servo/bootstrap_commands.py')
-rw-r--r--python/servo/bootstrap_commands.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/python/servo/bootstrap_commands.py b/python/servo/bootstrap_commands.py
index 68edbdd38c8..b59b7fed929 100644
--- a/python/servo/bootstrap_commands.py
+++ b/python/servo/bootstrap_commands.py
@@ -79,7 +79,7 @@ class MachCommands(CommandBase):
def bootstrap_rustc(self, force=False):
rust_dir = path.join(
self.context.sharedir, "rust", *self.rust_snapshot_path().split("/"))
- if not force and path.exists(path.join(rust_dir, "bin", "rustc")):
+ if not force and path.exists(path.join(rust_dir, "rustc", "bin", "rustc")):
print("Snapshot Rust compiler already downloaded.", end=" ")
print("Use |bootstrap-rust --force| to download again.")
return
@@ -130,7 +130,9 @@ class MachCommands(CommandBase):
if path.isdir(temp_dir):
shutil.rmtree(temp_dir)
extract(tgz_file, temp_dir)
- shutil.move(path.join(temp_dir, docs_name.split("/")[1], "share", "doc", "rust", "html"), docs_dir)
+ shutil.move(path.join(temp_dir, docs_name.split("/")[1],
+ "rust-docs", "share", "doc", "rust", "html"),
+ docs_dir)
shutil.rmtree(temp_dir)
print("Rust docs ready.")