From 3d3fa17c95e62c3304e69847601c3e0ce31b2ca0 Mon Sep 17 00:00:00 2001 From: Matthijs van Otterdijk Date: Thu, 14 Jul 2022 13:17:38 +0200 Subject: [PATCH] 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 --- src/bootstrap/channel.rs | 6 +++++- src/bootstrap/dist.rs | 5 ++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/bootstrap/channel.rs b/src/bootstrap/channel.rs index 1932a0017e..7974630106 100644 --- a/src/bootstrap/channel.rs +++ b/src/bootstrap/channel.rs @@ -29,7 +29,11 @@ pub struct Info { impl GitInfo { pub fn new(ignore_git: bool, dir: &Path) -> GitInfo { // See if this even begins to look like a git dir - if !dir.join(".git").exists() { + // + // Debian: force-enabling this block 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. + if true || !dir.join(".git").exists() { return GitInfo::Absent; } diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs index 1a59b3958f..3c6fa744e0 100644 --- a/src/bootstrap/dist.rs +++ b/src/bootstrap/dist.rs @@ -902,7 +902,10 @@ impl Step for PlainSourceTarball { } // If we're building from git sources, we need to vendor a complete distribution. - if builder.rust_info.is_git() { + // + // Debian: disabling this block 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_git() { // Ensure we have the submodules checked out. builder.update_submodule(Path::new("src/tools/rust-analyzer")); -- 2.30.2