diff options
| author | Nilstrieb <48135649+Nilstrieb@users.noreply.github.com> | 2023-04-16 21:36:05 +0200 |
|---|---|---|
| committer | Nilstrieb <48135649+Nilstrieb@users.noreply.github.com> | 2023-04-16 21:36:05 +0200 |
| commit | 46a25581aae5815382aa9291ec7071aafbfea7ba (patch) | |
| tree | 6046638c80370f6b76d6c886b970180062859ecf | |
| parent | fa4639195c3e3b010df68dcbc9f908dd57282894 (diff) | |
| download | rust-46a25581aae5815382aa9291ec7071aafbfea7ba.tar.gz rust-46a25581aae5815382aa9291ec7071aafbfea7ba.zip | |
Extract variable
| -rw-r--r-- | src/bootstrap/bootstrap.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/bootstrap/bootstrap.py b/src/bootstrap/bootstrap.py index 9e4c0d2b167..30613e47cbd 100644 --- a/src/bootstrap/bootstrap.py +++ b/src/bootstrap/bootstrap.py @@ -438,11 +438,12 @@ class RustBuild(object): tarball_suffix = '.tar.gz' if lzma is None else '.tar.xz' + toolchain_suffix = "{}-{}{}".format(rustc_channel, self.build, tarball_suffix) + tarballs_to_download = [ - ("rust-std-{}-{}{}".format(rustc_channel, self.build, tarball_suffix), - "rust-std-{}".format(self.build)), - ("rustc-{}-{}{}".format(rustc_channel, self.build, tarball_suffix), "rustc"), - ("cargo-{}-{}{}".format(rustc_channel, self.build, tarball_suffix), "cargo"), + ("rust-std-{}".format(toolchain_suffix), "rust-std-{}".format(self.build)), + ("rustc-{}".format(toolchain_suffix), "rustc"), + ("cargo-{}".format(toolchain_suffix), "cargo"), ] for filename, pattern in tarballs_to_download: |