diff options
| author | Gabriel F. T. Gomes <gabriel@inconstante.eti.br> | 2018-11-10 15:31:27 -0200 |
|---|---|---|
| committer | Gabriel F. T. Gomes <gabriel@inconstante.eti.br> | 2018-11-10 16:08:55 -0200 |
| commit | f933650579234d1329f3b10de232ce802bbb772b (patch) | |
| tree | 8453d6c742537ecaf445f6c3d588267b48180d33 | |
| parent | 97c60ae8446c207b6a3a073d3649967e039c161b (diff) | |
| download | bash-completion-f933650579234d1329f3b10de232ce802bbb772b.tar.gz | |
Revert "Extra fix for man completion"
This reverts commit c4ea37493f4c7c287ea0b0048bb58635f855b7bf.
The discussion upstream [1] exposed some potential, undesired
side-effects that this fix could cause, hence the reversion.
[1] https://github.com/scop/bash-completion/pull/252#issuecomment-435928977
| -rw-r--r-- | debian/changelog | 3 | ||||
| -rw-r--r-- | debian/patches/09-fallbacks-for-man-completion.patch | 38 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
3 files changed, 3 insertions, 39 deletions
diff --git a/debian/changelog b/debian/changelog index dc154209..f7de9575 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,9 @@ bash-completion (1:2.8-3) UNRELEASED; urgency=medium * Fix extremely annoying and long-standing breakage of completion within POSIX command substitution $(). (Closes: #742466) + [Gabriel F. T. Gomes <gabriel@inconstante.eti.br>] + * Revert `Extra fix for man completion' (from version 1:2.8-2). + -- Gabriel F. T. Gomes <gabriel@inconstante.eti.br> Sun, 04 Nov 2018 18:48:03 -0200 bash-completion (1:2.8-2) unstable; urgency=low diff --git a/debian/patches/09-fallbacks-for-man-completion.patch b/debian/patches/09-fallbacks-for-man-completion.patch deleted file mode 100644 index 023ea903..00000000 --- a/debian/patches/09-fallbacks-for-man-completion.patch +++ /dev/null @@ -1,38 +0,0 @@ -From: Paul Wise <pabs@debian.org> -Subject: Fallbacks for man completion -Origin: vendor, https://bugs.debian.org/892307#27 -Bug-Debian: https://bugs.debian.org/892307 -Forwarded: yes, https://github.com/scop/bash-completion/pull/252 - -Upstream commit: - - commit e6a471511dfdc230ff3eed65ccba09b6d7d30262 - Author: Pawel <pawel.veselov@gmail.com> - Date: Wed Sep 27 06:34:59 2017 +0200 - - man: Don't use $MANPATH directly (#161) - -fixes the behavior of man completion when MANPATH is set, however, it -misses the following: - - * falling back on `man --path` when the man implementation does not - have support for `manpath` and `man -w` - * falling back on $MANPATH when the man implementation does not have - support for printing the manual pages paths - -This patch addresses them. - -diff --git a/completions/man b/completions/man -index 0668b8ee..d0068fc7 100644 ---- a/completions/man -+++ b/completions/man -@@ -51,7 +51,8 @@ _man() - return - fi - -- local manpath=$( manpath 2>/dev/null || command man -w 2>/dev/null ) -+ local manpath=$( manpath 2>/dev/null || command man -w 2>/dev/null || command man --path 2>/dev/null ) -+ [[ -z $manpath ]] && manpath=$MANPATH - [[ -z $manpath ]] && manpath="/usr/share/man:/usr/local/share/man" - - # determine manual section to search diff --git a/debian/patches/series b/debian/patches/series index a183936f..cc09e7f1 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -7,5 +7,4 @@ 06-xpdf_support_compressed_pdf.patch 07-dpkg_support_raw-extract_vextract.patch 08-completion-for-cvs-log.patch -09-fallbacks-for-man-completion.patch 99-use-install-data-hook.patch |