summaryrefslogtreecommitdiffstats
path: root/debian/patches/d-bootstrap-disable-git.patch
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--debian/patches/d-bootstrap-disable-git.patch32
1 files changed, 14 insertions, 18 deletions
diff --git a/debian/patches/d-bootstrap-disable-git.patch b/debian/patches/d-bootstrap-disable-git.patch
index 63823f51b..ddbe186e6 100644
--- a/debian/patches/d-bootstrap-disable-git.patch
+++ b/debian/patches/d-bootstrap-disable-git.patch
@@ -10,36 +10,32 @@ Forwarded: not-needed
src/bootstrap/dist.rs | 5 ++++-
2 files changed, 9 insertions(+), 2 deletions(-)
-diff --git a/src/bootstrap/channel.rs b/src/bootstrap/channel.rs
-index 1932a00..7974630 100644
--- a/src/bootstrap/channel.rs
+++ b/src/bootstrap/channel.rs
-@@ -29,7 +29,11 @@ pub struct Info {
+@@ -33,6 +33,12 @@
+
impl GitInfo {
pub fn new(ignore_git: bool, dir: &Path) -> GitInfo {
- // See if this even begins to look like a git dir
-- if !dir.join(".git").exists() {
+ //
-+ // Debian: force-enabling this block because the debian package is also in a git
-+ // repository, but we don't want to parse gitinfo. This is needed for the
-+ // bootstrap tests to work which running for Debian git.
-+ if true || !dir.join(".git").exists() {
- return GitInfo::Absent;
- }
-
-diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs
-index 6181a61..5fe3600 100644
++ // Debian: returning early because the Debian package is also in a git
++ // repository, but we don't want to parse gitinfo. This is
++ // needed for the bootstrap tests to work which running for
++ // Debian git.
++ return GitInfo::Absent;
+ // See if this even begins to look like a git dir
+ if !dir.join(".git").exists() {
+ match read_commit_info_file(dir) {
--- a/src/bootstrap/dist.rs
+++ b/src/bootstrap/dist.rs
-@@ -902,7 +902,10 @@ impl Step for PlainSourceTarball {
+@@ -925,7 +925,10 @@
}
// If we're building from git sources, we need to vendor a complete distribution.
-- if builder.rust_info.is_git() {
+- if builder.rust_info.is_managed_git_subrepository() {
+ //
-+ // Debian: disabling this block because the debian package is also in a git
++ // Debian: short-circuited 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() {
++ if false && builder.rust_info.is_managed_git_subrepository() {
// Ensure we have the submodules checked out.
builder.update_submodule(Path::new("src/tools/rust-analyzer"));