Hello community, here is the log from the commit of package bash-completion checked in at Tue May 6 18:49:06 CEST 2008. -------- --- bash-completion/bash-completion.changes 2008-05-05 16:13:59.000000000 +0200 +++ /mounts/work_src_done/NOARCH/bash-completion/bash-completion.changes 2008-05-06 15:38:47.000000000 +0200 @@ -1,0 +2,7 @@ +Tue May 6 15:37:54 CEST 2008 - mkoenig@suse.de + +- remove default tilde expansion, as this should be configurable + by the expand-tilde readline setting, even with bash-completion + installed [bnc#386844] + +------------------------------------------------------------------- New: ---- bash-completion-no_tilde_expansion.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bash-completion.spec ++++++ --- /var/tmp/diff_new_pack.Ei4028/_old 2008-05-06 18:48:34.000000000 +0200 +++ /var/tmp/diff_new_pack.Ei4028/_new 2008-05-06 18:48:34.000000000 +0200 @@ -17,7 +17,7 @@ Requires: bash AutoReqProv: on Version: 20060301 -Release: 76 +Release: 78 Summary: Programmable Completion for Bash Url: http://www.caliban.org/bash/index.shtml#completion Source0: http://www.caliban.org/files/bash/bash-completion-%version.tar.bz2 @@ -27,6 +27,7 @@ Patch1: bash-completion-bzip2_fix.patch Patch2: bash-completion-svn_filenames.patch Patch3: bash-completion-mount_dir_fix.patch +Patch4: bash-completion-no_tilde_expansion.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch @@ -46,6 +47,7 @@ %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 %build # empty @@ -86,6 +88,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue May 06 2008 mkoenig@suse.de +- remove default tilde expansion, as this should be configurable + by the expand-tilde readline setting, even with bash-completion + installed [bnc#386844] * Mon May 05 2008 mkoenig@suse.de - fix mount completion for root [bnc#386459] * Tue Apr 22 2008 mkoenig@suse.de ++++++ bash-completion-no_tilde_expansion.patch ++++++ Index: bash_completion/bash_completion =================================================================== --- bash_completion.orig/bash_completion +++ bash_completion/bash_completion @@ -189,8 +189,6 @@ _filedir() { local IFS=$'\t\n' xspec #glob - _expand || return 0 - #glob=$(set +o|grep noglob) # save glob setting. #set -f # disable pathname expansion (globbing) @@ -268,23 +266,6 @@ _available_interfaces() sed -ne 's|^\('$cur'[^[:space:][:punct:]]\{1,\}\).*$|\1|p') ) } -# This function expands tildes in pathnames -# -_expand() -{ - [ "$cur" != "${cur%\\}" ] && cur="$cur\\" - - # expand ~username type directory specifications - if [[ "$cur" == \~*/* ]]; then - eval cur=$cur - - elif [[ "$cur" == \~* ]]; then - cur=${cur#\~} - COMPREPLY=( $( compgen -P '~' -u $cur ) ) - return ${#COMPREPLY[@]} - fi -} - # This function completes on process IDs. # AIX and Solaris ps prefers X/Open syntax. [ $UNAME = SunOS -o $UNAME = AIX ] && @@ -762,8 +743,6 @@ _man() cur=${COMP_WORDS[COMP_CWORD]} prev=${COMP_WORDS[COMP_CWORD-1]} - _expand || return 0 - # default completion if parameter contains / if [[ "$cur" == */* ]]; then _filedir @@ -966,8 +945,6 @@ _find() ;; esac - _expand || return 0 - # set exprfound to 1 if there is already an expression present for i in ${COMP_WORDS[@]}; do [[ "$i" = [-\(\),\!]* ]] && exprfound=1 && break @@ -2575,8 +2552,6 @@ _scp() COMPREPLY=() cur=${COMP_WORDS[COMP_CWORD]} - _expand || return 0 - if [[ "$cur" == *:* ]]; then # remove backslash escape from : cur=${cur/\\:/:} @@ -2618,8 +2593,6 @@ _rsync() cur=${COMP_WORDS[COMP_CWORD]} prev=${COMP_WORDS[COMP_CWORD-1]} - _expand || return 0 - case "$prev" in --@(config|password-file|include-from|exclude-from)) _filedir @@ -3315,8 +3288,6 @@ _gzip() xspec= fi - _expand || return 0 - COMPREPLY=( $( compgen -f -X "$xspec" -- $cur ) \ $( compgen -d -- $cur ) ) } && @@ -3353,8 +3324,6 @@ _bzip2() [[ "$prev" == -*z* ]] && xspec= fi - _expand || return 0 - COMPREPLY=( $( compgen -f -X "$xspec" -- $cur ) \ $( compgen -d -- $cur ) ) } && @@ -4148,8 +4117,6 @@ _gcc() COMPREPLY=() cur=${COMP_WORDS[COMP_CWORD]} - _expand || return 0 - case "$1" in gcj) backend=jc1 @@ -4226,8 +4193,6 @@ _dpkg() prev=${COMP_WORDS[COMP_CWORD-1]} i=$COMP_CWORD - _expand || return 0 - # find the last option flag if [[ $cur != -* ]]; then while [[ $prev != -* && $i != 1 ]]; do @@ -6783,8 +6748,6 @@ _dd() ;; esac - _expand || return 0 - COMPREPLY=( $( compgen -W '--help --version' -- $cur ) \ $( compgen -W 'bs cbs conv count ibs if obs of seek skip'\ -S '=' -- $cur ) ) @@ -6938,8 +6901,6 @@ _info() COMPREPLY=() cur=${COMP_WORDS[COMP_CWORD]} - _expand || return 0 - # default completion if parameter contains / if [[ "$cur" == */* ]]; then _filedir @@ -9244,8 +9205,6 @@ _filedir_xspec() COMPREPLY=() cur=${COMP_WORDS[COMP_CWORD]} - _expand || return 0 - # get first exclusion compspec that matches this command xspec=$( sed -ne $'/^complete .*[ \t]'${1##*/}$'\([ \t]\|$\)/{p;q;}' \ $BASH_COMPLETION ) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org