From: Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
Date: Fri, 10 Apr 2020 10:33:25 +0000 (+0100)
Subject: d-read-beta-version-from-file
X-Git-Tag: archive/raspbian/1.42.0+dfsg1-1+rpi1~1^2~6
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=cd205137d89f9b4ca6fe49bf7477878a1e6e60cf;p=rustc.git

d-read-beta-version-from-file

===================================================================

Gbp-Pq: Name d-read-beta-version-from-file.patch
---

diff --git a/src/bootstrap/lib.rs b/src/bootstrap/lib.rs
index 1fee3fd9ac..1aecf83c04 100644
--- a/src/bootstrap/lib.rs
+++ b/src/bootstrap/lib.rs
@@ -929,29 +929,13 @@ impl Build {
             return s;
         }
 
-        let beta = output(
-            Command::new("git").arg("ls-remote").arg("origin").arg("beta").current_dir(&self.src),
-        );
-        let beta = beta.trim().split_whitespace().next().unwrap();
-        let master = output(
-            Command::new("git").arg("ls-remote").arg("origin").arg("master").current_dir(&self.src),
-        );
-        let master = master.trim().split_whitespace().next().unwrap();
-
-        // Figure out where the current beta branch started.
-        let base = output(
-            Command::new("git").arg("merge-base").arg(beta).arg(master).current_dir(&self.src),
-        );
-        let base = base.trim();
-
-        // Next figure out how many merge commits happened since we branched off
-        // beta. That's our beta number!
+        // 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(format!("{}...HEAD", base))
+            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();