Skip to content
Permalink
Browse files

Fix Python 3 support in mach’s `ensure_bootstrapped`

  • Loading branch information
SimonSapin committed Jan 2, 2020
1 parent 895cf69 commit 1d3fdc471e19a44d69526b9d94e5a13550b2d1a4
Showing with 2 additions and 2 deletions.
  1. +2 −2 python/servo/command_base.py
@@ -1008,14 +1008,14 @@ def ensure_bootstrapped(self, target=None, rustup_components=None):
self.ensure_rustup_version()
toolchain = self.rust_toolchain()

if toolchain not in check_output(["rustup", "toolchain", "list"]):
if toolchain.encode("utf-8") not in check_output(["rustup", "toolchain", "list"]):
check_call(["rustup", "toolchain", "install", "--profile", "minimal", toolchain])

installed = check_output(
["rustup", "component", "list", "--installed", "--toolchain", toolchain]
)
for component in set(rustup_components or []) | {"rustc-dev"}:
if component not in installed:
if component.encode("utf-8") not in installed:
check_call(["rustup", "component", "add", "--toolchain", toolchain, component])

if target and "uwp" not in target and target not in check_output(

0 comments on commit 1d3fdc4

Please sign in to comment.
You can’t perform that action at this time.