Don't check for cargo-vendor when building from (Debian's) git

Forwarded: not-needed

Forwarded: not-needed

Gbp-Pq: Name d-bootstrap-disable-git.patch

diff --git a/src/bootstrap/channel.rs b/src/bootstrap/channel.rs
index 87018574048a030fdfd48cb70d459b62c63e288a..5b63edbcdb1ee94b4a22b4840f615a2438def68a 100644 (file)
--- a/src/bootstrap/channel.rs
+++ b/src/bootstrap/channel.rs
@@ -36,6 +36,12 @@ pub struct Info {
 
 impl GitInfo {
     pub fn new(omit_git_hash: bool, dir: &Path) -> GitInfo {
+        //
+        // Debian: returning early because the Debian package is also in a git
+        //         repository, but we don't want to parse gitinfo. This is
+        //         needed for the bootstrap tests to work which running for
+        //         Debian git.
+        return GitInfo::Absent;
         // See if this even begins to look like a git dir
         if !dir.join(".git").exists() {
             match read_commit_info_file(dir) {

diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs
index 32da4ac29a46357c863159913a0f477b918224eb..3f409e749080312dedf0ec2c8eaefc94a60dd648 100644 (file)
--- a/src/bootstrap/dist.rs
+++ b/src/bootstrap/dist.rs
@@ -1002,7 +1002,10 @@ impl Step for PlainSourceTarball {
         }
 
         // If we're building from git sources, we need to vendor a complete distribution.
-        if builder.rust_info().is_managed_git_subrepository() {
+        //
+        // Debian: short-circuited because the Debian package is also in a git
+        //         repository, but cargo-vendor should not be installed or run.
+        if false && builder.rust_info().is_managed_git_subrepository() {
             // Ensure we have the submodules checked out.
             builder.update_submodule(Path::new("src/tools/cargo"));
             builder.update_submodule(Path::new("src/tools/rust-analyzer"));