diff options
| author | Corey Farwell <coreyf@rwell.org> | 2017-02-08 23:55:47 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-08 23:55:47 -0500 |
| commit | 9f2795f7bdc040c514d56d19cf7eb6b6fc1ed366 (patch) | |
| tree | c900f10badaf0c0b3fb3b7741643c534d123946a | |
| parent | a7017b582c640d6982bc1c77b76905a6389b01d6 (diff) | |
| parent | bf126d244e28ba9bb6ce56127ebe6d5703d87a39 (diff) | |
| download | rust-9f2795f7bdc040c514d56d19cf7eb6b6fc1ed366.tar.gz rust-9f2795f7bdc040c514d56d19cf7eb6b6fc1ed366.zip | |
Rollup merge of #39599 - alexcrichton:cargo-tarball-name, r=brson
Fix a manifest-generation bug on beta Right now all Cargo release tarballs are 'nightly', they're not on the standard channels yet.
| -rw-r--r-- | src/tools/build-manifest/src/main.rs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/tools/build-manifest/src/main.rs b/src/tools/build-manifest/src/main.rs index 548a11439f5..0aefe703c9c 100644 --- a/src/tools/build-manifest/src/main.rs +++ b/src/tools/build-manifest/src/main.rs @@ -326,6 +326,8 @@ impl Builder { fn filename(&self, component: &str, target: &str) -> String { if component == "rust-src" { format!("rust-src-{}.tar.gz", self.channel) + } else if component == "cargo" { + format!("cargo-nightly-{}.tar.gz", target) } else { format!("{}-{}-{}.tar.gz", component, self.channel, target) } |