summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrank Terbeck <ft@bewatermyfriend.org>2019-01-27 17:56:06 +0100
committerMichael Prokop <mika@debian.org>2019-01-27 22:34:09 +0100
commitcb6fba88d0092fb33d96f564858ac7d4833e45b3 (patch)
treef42d2d323bef5f9676fd7724540e9fa6edf28cc5
parentf08aa056c7eb6cac66b5d81fb90b27bd3312a1cf (diff)
downloadzsh-cb6fba88d0092fb33d96f564858ac7d4833e45b3.tar.gz
zsh-cb6fba88d0092fb33d96f564858ac7d4833e45b3.zip
Fix perforce detection in vcs-info
This is known upstream, this is a quickfix to limit our user's exposure to the issue.
-rw-r--r--debian/patches/fix-vcs-info-p4.patch12
-rw-r--r--debian/patches/series1
2 files changed, 13 insertions, 0 deletions
diff --git a/debian/patches/fix-vcs-info-p4.patch b/debian/patches/fix-vcs-info-p4.patch
new file mode 100644
index 000000000..6da2707aa
--- /dev/null
+++ b/debian/patches/fix-vcs-info-p4.patch
@@ -0,0 +1,12 @@
+Index: pkg-zsh/Functions/VCS_Info/Backends/VCS_INFO_detect_p4
+===================================================================
+--- pkg-zsh.orig/Functions/VCS_Info/Backends/VCS_INFO_detect_p4
++++ pkg-zsh/Functions/VCS_Info/Backends/VCS_INFO_detect_p4
+@@ -44,7 +44,6 @@ VCS_INFO_p4_get_server() {
+ }
+
+
+-(( ${+functions[VCS_INFO_detect_p4]} )) ||
+ VCS_INFO_detect_p4() {
+ local serverport p4where
+
diff --git a/debian/patches/series b/debian/patches/series
index c4da55074..b845fb42a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+fix-vcs-info-p4.patch
further-mitigate-test-suite-hangs.patch
update-debian-sections.patch
example-shebang.patch