d-disable-cargo-vendor
authorRust Maintainers <pkg-rust-maintainers@lists.alioth.debian.org>
Sun, 15 Oct 2017 21:30:35 +0000 (22:30 +0100)
committerXimin Luo <infinity0@debian.org>
Sun, 15 Oct 2017 21:30:35 +0000 (22:30 +0100)
Gbp-Pq: Name d-disable-cargo-vendor.patch

src/bootstrap/dist.rs

index 807e878eda6b27a96cc706e81c790e943c29daa3..bd344fb71548dcfc7c3f91dbd548286b24d2bbaa 100644 (file)
@@ -624,7 +624,10 @@ pub fn plain_source_tarball(build: &Build) {
     write_file(&plain_dst_src.join("version"), build.rust_version().as_bytes());
 
     // If we're building from git sources, we need to vendor a complete distribution.
-    if build.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 && build.rust_info.is_git() {
         // Get cargo-vendor installed, if it isn't already.
         let mut has_cargo_vendor = false;
         let mut cmd = Command::new(&build.initial_cargo);