From 537ba63858f6eb768cdb0ff42f407a1ad310c2f0 Mon Sep 17 00:00:00 2001 From: Matthijs van Otterdijk Date: Sat, 29 Aug 2020 16:54:36 +0100 Subject: [PATCH] Don't check for cargo-vendor when building from (Debian's) git Forwarded: not-needed Forwarded: not-needed Gbp-Pq: Name d-disable-cargo-vendor.patch --- src/bootstrap/dist.rs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs index 5d2fcba7fe..85c76750fd 100644 --- a/src/bootstrap/dist.rs +++ b/src/bootstrap/dist.rs @@ -1106,7 +1106,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() { // Vendor all Cargo dependencies let mut cmd = Command::new(&builder.initial_cargo); cmd.arg("vendor") -- 2.30.2