diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2018-01-26 06:52:55 -0800 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2018-01-26 06:52:55 -0800 |
| commit | b741d7d7acea0336822138c06dc19284fbc2cf3b (patch) | |
| tree | 6b621c81720125ae65f2fd83240cf67834d6aa7d /src/bootstrap | |
| parent | afc977fa237ea486efc571b540e81bcfa7a2a7a7 (diff) | |
| parent | a76bb8806ae506a5d11c88a3dbd6377d6c4bc1ec (diff) | |
| download | rust-b741d7d7acea0336822138c06dc19284fbc2cf3b.tar.gz rust-b741d7d7acea0336822138c06dc19284fbc2cf3b.zip | |
Merge branch 'beta-prerelease' of https://github.com/cuviper/rust into rollup
Diffstat (limited to 'src/bootstrap')
| -rw-r--r-- | src/bootstrap/lib.rs | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/bootstrap/lib.rs b/src/bootstrap/lib.rs index 565320c9521..a6a5ba67723 100644 --- a/src/bootstrap/lib.rs +++ b/src/bootstrap/lib.rs @@ -771,7 +771,11 @@ impl Build { fn release(&self, num: &str) -> String { match &self.config.channel[..] { "stable" => num.to_string(), - "beta" => format!("{}-beta.{}", num, self.beta_prerelease_version()), + "beta" => if self.rust_info.is_git() { + format!("{}-beta.{}", num, self.beta_prerelease_version()) + } else { + format!("{}-beta", num) + }, "nightly" => format!("{}-nightly", num), _ => format!("{}-dev", num), } |