From bc26e9b547b6851071529f6fc725e1eb44af2fb8 Mon Sep 17 00:00:00 2001 From: Matthijs van Otterdijk Date: Thu, 30 May 2019 05:52:37 +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 2dae3f9135..e99c5628d8 100644 --- a/src/bootstrap/dist.rs +++ b/src/bootstrap/dist.rs @@ -992,7 +992,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() { // Get cargo-vendor installed, if it isn't already. let mut has_cargo_vendor = false; let mut cmd = Command::new(&builder.initial_cargo); -- 2.30.2