diff options
| author | Simon Sapin <simon.sapin@exyr.org> | 2016-07-07 17:07:00 +0200 |
|---|---|---|
| committer | Simon Sapin <simon.sapin@exyr.org> | 2016-07-08 22:27:20 +0200 |
| commit | 6ae5598a5ca7811de122c89db67df89f9a163bbc (patch) | |
| tree | df20469b7cbc72718ee8245becc8b0e0763bc11b /python/servo/command_base.py | |
| parent | a39170728d91fa586e3ebdb050a4c35933d1de3c (diff) | |
| download | servo-6ae5598a5ca7811de122c89db67df89f9a163bbc.tar.gz servo-6ae5598a5ca7811de122c89db67df89f9a163bbc.zip | |
Fix "looking for rustc at …" message for stable when already bootstrapped
Also always download from static-rust-lang-org.s3.amazonaws.com instead
of static.rust-lang.org. They host the same content, but the latter goes
through a CDN and has a TLS certificate that failed to verify and some
Python versions:
https://github.com/servo/servo/issues/3582
https://github.com/servo/servo/pull/3971
Diffstat (limited to 'python/servo/command_base.py')
| -rw-r--r-- | python/servo/command_base.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/python/servo/command_base.py b/python/servo/command_base.py index 9f4f9096316..b9a555f4ff0 100644 --- a/python/servo/command_base.py +++ b/python/servo/command_base.py @@ -218,10 +218,11 @@ class CommandBase(object): return self._use_stable_rust def rust_path(self): + version = self.rust_version() if self._use_stable_rust: - return "rustc-%s-%s" % (self.rust_version(), host_triple()) + return "%s/rustc-%s-%s" % (version, version, host_triple()) else: - return "%s/rustc-nightly-%s" % (self.rust_version(), host_triple()) + return "%s/rustc-nightly-%s" % (version, host_triple()) def rust_version(self): if self._rust_version is None or self._use_stable_rust != self._rust_version_is_stable: |