diff options
| author | Matt Brubeck <mbrubeck@limpet.net> | 2014-11-05 13:59:31 -0800 |
|---|---|---|
| committer | Matt Brubeck <mbrubeck@limpet.net> | 2014-11-05 14:07:02 -0800 |
| commit | 2ee516fa7ca43a2bede2b97aa7dbd80709e4828f (patch) | |
| tree | 9402e8d15c41b8227e8e9d28f578b60aa09e4d19 /python/servo/bootstrap_commands.py | |
| parent | 75b340a243f4740376497a52e1c2eb639d9ac827 (diff) | |
| download | servo-2ee516fa7ca43a2bede2b97aa7dbd80709e4828f.tar.gz servo-2ee516fa7ca43a2bede2b97aa7dbd80709e4828f.zip | |
Automatically update cargo when necessary
Diffstat (limited to 'python/servo/bootstrap_commands.py')
| -rw-r--r-- | python/servo/bootstrap_commands.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/python/servo/bootstrap_commands.py b/python/servo/bootstrap_commands.py index 825796ea311..4494d4d4c06 100644 --- a/python/servo/bootstrap_commands.py +++ b/python/servo/bootstrap_commands.py @@ -96,7 +96,8 @@ class MachCommands(CommandBase): action='store_true', help='Force download even if cargo already exists') def bootstrap_cargo(self, force=False): - cargo_dir = path.join(self.context.sharedir, "cargo") + cargo_dir = path.join(self.context.sharedir, "cargo", + self.cargo_build_id()) if not force and path.exists(path.join(cargo_dir, "bin", "cargo")): print("Cargo already downloaded.", end=" ") print("Use |bootstrap_cargo --force| to download again.") @@ -104,11 +105,12 @@ class MachCommands(CommandBase): if path.isdir(cargo_dir): shutil.rmtree(cargo_dir) - os.mkdir(cargo_dir) + os.makedirs(cargo_dir) tgz_file = "cargo-nightly-%s.tar.gz" % host_triple() # FIXME(#3582): use https. - nightly_url = "http://static.rust-lang.org/cargo-dist/2014-10-21/%s" % tgz_file + nightly_url = "http://static.rust-lang.org/cargo-dist/%s/%s" % \ + (self.cargo_build_id(), tgz_file) download("Cargo nightly", nightly_url, tgz_file) |