From 6ae5598a5ca7811de122c89db67df89f9a163bbc Mon Sep 17 00:00:00 2001 From: Simon Sapin Date: Thu, 7 Jul 2016 17:07:00 +0200 Subject: =?UTF-8?q?Fix=20"looking=20for=20rustc=20at=20=E2=80=A6"=20messag?= =?UTF-8?q?e=20for=20stable=20when=20already=20bootstrapped?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- python/servo/command_base.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'python/servo/command_base.py') 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: -- cgit v1.2.3