projects
/
rustc.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
459f62e
)
d-disable-cargo-vendor
author
Rust Maintainers
<pkg-rust-maintainers@lists.alioth.debian.org>
Wed, 7 Mar 2018 19:07:27 +0000
(19:07 +0000)
committer
Ximin Luo
<infinity0@debian.org>
Wed, 7 Mar 2018 19:07:27 +0000
(19:07 +0000)
Gbp-Pq: Name d-disable-cargo-vendor.patch
src/bootstrap/dist.rs
patch
|
blob
|
history
diff --git
a/src/bootstrap/dist.rs
b/src/bootstrap/dist.rs
index f011069a700ee9ae2fa927ddcdc3e53fd240e272..e3a87c85bba662ab0c5e8e8d6662fcc54df251f0 100644
(file)
--- a/
src/bootstrap/dist.rs
+++ b/
src/bootstrap/dist.rs
@@
-872,7
+872,10
@@
impl Step for PlainSourceTarball {
}
// 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);