commit bash-completion for openSUSE:Factory
![](https://seccdn.libravatar.org/avatar/e2145bc5cf53dda95c308a3c75e8fef3.jpg?s=120&d=mm&r=g)
Hello community, here is the log from the commit of package bash-completion for openSUSE:Factory checked in at 2014-11-26 10:32:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/bash-completion (Old) and /work/SRC/openSUSE:Factory/.bash-completion.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "bash-completion" Changes: -------- --- /work/SRC/openSUSE:Factory/bash-completion/bash-completion.changes 2013-05-16 09:43:32.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.bash-completion.new/bash-completion.changes 2014-11-26 10:32:44.000000000 +0100 @@ -1,0 +2,10 @@ +Mon Nov 17 12:46:11 UTC 2014 - werner@suse.de + +- Add patch PS1-completion-boo903362.patch to avoid trouble if + restricted characters of the shell are used in PS1 like + exclamation mark (boo#903362). +- Add patch FOO-dir-completion-boo905348.patch to expand variables + which value is actual a directory to avoid excaped dollar sign + (boo#905348). + +------------------------------------------------------------------- New: ---- FOO-dir-completion-boo905348.patch PS1-completion-boo903362.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bash-completion.spec ++++++ --- /var/tmp/diff_new_pack.WyNn4G/_old 2014-11-26 10:32:44.000000000 +0100 +++ /var/tmp/diff_new_pack.WyNn4G/_new 2014-11-26 10:32:44.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package bash-completion # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -29,6 +29,10 @@ Patch0: %{name}-%{version}.patch # PATCH-PATCH-EXTEND-OPENSUSE bnc#818365 -- bash completion for builtin command "pushd" is missing Patch1: pushd-completion-bnc818365.patch +# PATCH-FIX-SUSE bnc#903362 -- tab completion for file names prints error +Patch2: PS1-completion-boo903362.patch +# PATCH-FIX-SUSE bnc#905348 -- tab completion with shell variable changes command line with backslash +Patch3: FOO-dir-completion-boo905348.patch BuildRequires: pkg-config Requires: bash BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -42,6 +46,8 @@ %setup -q %patch0 -b .p0 %patch1 -b .p1 +%patch2 -b .p2 +%patch3 -b .p3 %build %configure ++++++ FOO-dir-completion-boo905348.patch ++++++ --- bash_completion | 8 ++++++++ 1 file changed, 8 insertions(+) --- bash_completion +++ bash_completion 2014-11-17 12:41:17.573518527 +0000 @@ -565,6 +565,14 @@ _filedir() local -a toks local quoted x tmp + if [[ $cur =~ ^(\$\{?)([A-Za-z0-9_]*)/ ]]; then + eval local dir="${cur%%/*}" + if [[ -d "$dir" ]]; then + cur="${dir}/${cur#*/}" + [[ "$1" != -d ]] && set -- -d $@ + fi + fi + _quote_readline_by_ref "$cur" quoted x=$( compgen -d -- "$quoted" ) && while read -r tmp; do ++++++ PS1-completion-boo903362.patch ++++++ --- bash_completion.sh.in | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) --- bash_completion.sh.in +++ bash_completion.sh.in 2014-11-17 12:17:01.505519084 +0000 @@ -1,9 +1,10 @@ # Check for interactive bash and that we haven't already been sourced. -[ -z "$BASH_VERSION" -o -z "$PS1" -o -n "$BASH_COMPLETION_COMPAT_DIR" ] && return +[ -z "$BASH_VERSION" ] && return +[ -n "$BASH_COMPLETION_COMPAT_DIR" ] && return +[[ $- =~ i ]] || return # Check for recent enough version of bash. -bash=${BASH_VERSION%.*}; bmajor=${bash%.*}; bminor=${bash#*.} -if [ $bmajor -gt 4 ] || [ $bmajor -eq 4 -a $bminor -ge 1 ]; then +if [ ${BASH_VERSINFO[0]} -gt 4 ] || [ ${BASH_VERSINFO[0]} -eq 4 -a ${BASH_VERSINFO[1]} -ge 1 ]; then [ -r "${XDG_CONFIG_HOME:-$HOME/.config}/bash_completion" ] && \ . "${XDG_CONFIG_HOME:-$HOME/.config}/bash_completion" if shopt -q progcomp && [ -r @pkgdatadir@/bash_completion ]; then @@ -11,4 +12,3 @@ if [ $bmajor -gt 4 ] || [ $bmajor -eq 4 . @pkgdatadir@/bash_completion fi fi -unset bash bmajor bminor -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@hilbert.suse.de