mirror of
https://git.proxmox.com/git/rustc
synced 2025-08-25 06:34:28 +00:00
25 lines
951 B
Diff
25 lines
951 B
Diff
--- a/src/bootstrap/lib.rs
|
|
+++ b/src/bootstrap/lib.rs
|
|
@@ -1031,15 +1031,13 @@
|
|
return s;
|
|
}
|
|
|
|
- // Figure out how many merge commits happened since we branched off master.
|
|
- // That's our beta number!
|
|
- // (Note that we use a `..` range, not the `...` symmetric difference.)
|
|
+ // Debian: read beta number from "version" file, this is only available
|
|
+ // in the rustc upstream tarballs and not their git
|
|
let count = output(
|
|
- Command::new("git")
|
|
- .arg("rev-list")
|
|
- .arg("--count")
|
|
- .arg("--merges")
|
|
- .arg("refs/remotes/origin/master..HEAD")
|
|
+ Command::new("sed")
|
|
+ .arg("-re")
|
|
+ .arg(r"s/[0-9]+.[0-9]+.[0-9]+-beta.([0-9]+) \(.*\)/\1/g")
|
|
+ .arg("version")
|
|
.current_dir(&self.src),
|
|
);
|
|
let n = count.trim().parse().unwrap();
|