Hello community, here is the log from the commit of package bash-completion for openSUSE:Factory checked in at 2020-04-04 12:19:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/bash-completion (Old) and /work/SRC/openSUSE:Factory/.bash-completion.new.3248 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "bash-completion" Sat Apr 4 12:19:42 2020 rev:46 rq:790064 version:2.10 Changes: -------- --- /work/SRC/openSUSE:Factory/bash-completion/bash-completion-doc.changes 2020-03-23 12:49:38.423921748 +0100 +++ /work/SRC/openSUSE:Factory/.bash-completion.new.3248/bash-completion-doc.changes 2020-04-04 12:19:45.551641387 +0200 @@ -1,0 +2,6 @@ +Sat Mar 28 15:01:27 UTC 2020 - Michal Suchanek <msucha...@suse.de> + +- Fix completion excluding directories (boo#1167952). + * bash-completion-fix-missing-directory-completion-with-filename-pattern.patch + +------------------------------------------------------------------- bash-completion.changes: same change New: ---- bash-completion-fix-missing-directory-completion-with-filename-pattern.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bash-completion-doc.spec ++++++ --- /var/tmp/diff_new_pack.rCRqOm/_old 2020-04-04 12:19:47.663643201 +0200 +++ /var/tmp/diff_new_pack.rCRqOm/_new 2020-04-04 12:19:47.663643201 +0200 @@ -52,6 +52,8 @@ Patch10: backticks-bsc963140.patch # PATCH-FIX-SUSE boo#1090515 Patch12: bash-completion-2.7-unRAR-remove.patch +# PATCH-FIX-SUSE boo#1167952 +Patch13: bash-completion-fix-missing-directory-completion-with-filename-pattern.patch BuildRequires: asciidoc BuildRequires: libxslt-tools BuildRequires: pkg-config @@ -76,6 +78,7 @@ %patch9 -b .p9 %patch10 -b .p10 -p1 %patch12 -b .p12 -p0 +%patch13 -b .p13 -p1 %build %configure ++++++ bash-completion.spec ++++++ --- /var/tmp/diff_new_pack.rCRqOm/_old 2020-04-04 12:19:47.687643222 +0200 +++ /var/tmp/diff_new_pack.rCRqOm/_new 2020-04-04 12:19:47.687643222 +0200 @@ -54,6 +54,8 @@ Patch10: backticks-bsc963140.patch # PATCH-FIX-SUSE boo#1090515 Patch12: bash-completion-2.7-unRAR-remove.patch +# PATCH-FIX-SUSE boo#1167952 +Patch13: bash-completion-fix-missing-directory-completion-with-filename-pattern.patch %if %build_doc BuildRequires: asciidoc BuildRequires: libxslt-tools @@ -108,6 +110,7 @@ %patch9 -b .p9 %patch10 -b .p10 -p1 %patch12 -b .p12 -p0 +%patch13 -b .p13 -p1 %build %configure ++++++ bash-completion-fix-missing-directory-completion-with-filename-pattern.patch ++++++ >From 06f94a5c855fc38c0583a3b65c27c1c814a90bac Mon Sep 17 00:00:00 2001 From: Michal Suchanek <msucha...@suse.de> Date: Mon, 30 Mar 2020 19:48:39 +0200 Subject: [PATCH] Revert "_filedir: avoid duplicate dirs internally, and a compgen -d call for files" This reverts commit da99bc55954e9f60b9c3a9e9071ff6301d7015cb. References: https://github.com/scop/bash-completion/issues/378 boo#1167952 The solution without calling compgen -d proves unrealiable. Until this is fixed revert to calling compgen -d for completions with file pattern. --- bash_completion | 25 ++++++++----------------- 1 file changed, 8 insertions(+), 17 deletions(-) diff --git a/bash_completion b/bash_completion index 0fc89e51..015fea12 100644 --- a/bash_completion +++ b/bash_completion @@ -560,34 +560,25 @@ _filedir() local -a toks local reset - if [[ "$1" == -d ]]; then - reset=$(shopt -po noglob); set -o noglob - toks=( $(compgen -d -- "$cur") ) - IFS=' '; $reset; IFS=$'\n' - else + reset=$(shopt -po noglob); set -o noglob + toks=( $(compgen -d -- "$cur") ) + IFS=' '; $reset; IFS=$'\n' + + if [[ "$1" != -d ]]; then local quoted _quote_readline_by_ref "$cur" quoted # Munge xspec to contain uppercase version too # http://thread.gmane.org/gmane.comp.shells.bash.bugs/15294/focus=15306 - local xspec=${1:+"!*.@($1|${1^^})"} plusdirs=() - - # Use plusdirs to get dir completions if we have a xspec; if we don't, - # there's no need, dirs come along with other completions. Don't use - # plusdirs quite yet if fallback is in use though, in order to not ruin - # the fallback condition with the "plus" dirs. - local opts=( -f -X "$xspec" ) - [[ $xspec ]] && plusdirs=(-o plusdirs) - [[ ${COMP_FILEDIR_FALLBACK-} ]] || opts+=( "${plusdirs[@]}" ) - + local xspec=${1:+"!*.@($1|${1^^})"} reset=$(shopt -po noglob); set -o noglob - toks+=( $(compgen "${opts[@]}" -- $quoted) ) + toks+=( $(compgen -f -X "$xspec" -- $quoted) ) IFS=' '; $reset; IFS=$'\n' # Try without filter if it failed to produce anything and configured to [[ -n ${COMP_FILEDIR_FALLBACK:-} && -n "$1" && ${#toks[@]} -lt 1 ]] && { reset=$(shopt -po noglob); set -o noglob - toks+=( $(compgen -f "${plusdirs[@]}" -- $quoted) ) + toks+=( $(compgen -f -- $quoted) ) IFS=' '; $reset; IFS=$'\n' } fi -- 2.25.1