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

diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs
index 8d13df3ee21a49e2f179a68ae999d8cb041dca59..2265710c2ee5e2090a57399147a55283c3bbbe8f 100644 (file)
--- a/src/bootstrap/dist.rs
+++ b/src/bootstrap/dist.rs
@@ -1084,7 +1084,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").current_dir(&plain_dst_src);