Hello community, here is the log from the commit of package aaa_base for openSUSE:Factory checked in at 2012-03-19 09:51:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/aaa_base (Old) and /work/SRC/openSUSE:Factory/.aaa_base.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "aaa_base", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/aaa_base/aaa_base.changes 2012-03-14 14:12:23.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.aaa_base.new/aaa_base.changes 2012-03-19 09:52:18.000000000 +0100 @@ -1,0 +2,5 @@ +Thu Mar 15 13:58:24 UTC 2012 - [email protected] + +- Try to fix several bash completion bug caused by fix for bug #725657 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ aaa_base.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base/files/etc/profile.d/complete.bash new/aaa_base/files/etc/profile.d/complete.bash --- old/aaa_base/files/etc/profile.d/complete.bash 2012-03-13 17:09:23.000000000 +0100 +++ new/aaa_base/files/etc/profile.d/complete.bash 2012-03-15 14:56:59.000000000 +0100 @@ -9,14 +9,10 @@ _def="-o default -o bashdefault" _dir="-o nospace -o dirnames -o plusdirs" -_file="-o nospace -o dirnames" +_file="-o nospace -o filenames" +_mkdr="-o nospace -o dirnames" _nosp="-o nospace" -# -# bnc#725657 -# -shopt -s direxpand 2> /dev/null || true - # Escape file and directory names, add slash to directories if needed. # Escaping could be done by the option 'filenames' but this fails # e.g. on variable expansion like $HO<TAB> @@ -51,8 +47,9 @@ if test -d "$x" then compopt -o plusdirs - else compopt +o nospace + else + compopt -o nospace fi fi @@ -87,7 +84,7 @@ for x in ${CDPATH//:/$'\n'}; do o=${#COMPREPLY[@]} - for s in $(compgen -d $x/$c); do + for s in $(compgen -d +o plusdirs $x/$c); do if [[ (($sym == on && -h $s) || ($dir == on && ! -h $s)) && ! -d ${s#$x/} ]] ; then s="${s}/" fi @@ -179,7 +176,7 @@ let isdir++ eval COMPREPLY=\(${COMPREPLY[@]}\) fi ;; - \~*/*) COMPREPLY=($(compgen -d $s -- "${c}")) + \~*/*) COMPREPLY=($(compgen -d $s +o plusdirs -- "${c}")) if ((${#COMPREPLY[@]} > 0)) ; then compopt +o plusdirs let isdir++ @@ -191,7 +188,7 @@ fi ;; *\:*) if [[ $COMP_WORDBREAKS =~ : ]] ; then x=${c%"${c##*[^\\]:}"} - COMPREPLY=($(compgen -d $s -- "${c}")) + COMPREPLY=($(compgen -d $s +o plusdirs -- "${c}")) COMPREPLY=(${COMPREPLY[@]#"$x"}) ((${#COMPREPLY[@]} == 0)) || let isdir++ fi @@ -220,7 +217,7 @@ complete ${_def} ${_dir} -F _cd_ cd fi complete ${_def} ${_dir} -F _cd_ rmdir pushd chroot chrootx -complete ${_def} ${_file} -F _cd_ mkdir +complete ${_def} ${_mkdr} -F _cd_ mkdir # General expanding shell function _exp_ () @@ -421,7 +418,7 @@ COMPREPLY=($(compgen -W "${COMPREPLY[*]}" -- "$c")) ;; -s|e|-se) COMPREPLY=($(compgen -f -- "$c")) ;; -c|-x) COMPREPLY=($(compgen -f -- "$c")) ;; - -d) COMPREPLY=($(compgen -d ${_nosp} -- "$c")) ;; + -d) COMPREPLY=($(compgen -d ${_nosp} +o plusdirs -- "$c")) ;; *) if test -z "$c"; then COMPREPLY=($(command ps axho comm,pid |\ @@ -508,13 +505,13 @@ --) COMPREPLY=($ol) ;; -?) COMPREPLY=($c) ;; \./*) - COMPREPLY=($(compgen -f -d -X '\./.*' -- $c)) ;; + COMPREPLY=($(compgen -f -d -X '\./.*' +o plusdirs -- $c)) ;; [0-9n]|[0-9n]p) COMPREPLY=($c) ;; *) case "$o" in -l|--local-file) - COMPREPLY=($(compgen -f -d -X '.*' -- $c)) ;; + COMPREPLY=($(compgen -f -d -X '.*' +o plusdirs -- $c)) ;; [0-9n]|[0-9n]p) s=$(eval echo {${m}}$o/) if type -p sed &> /dev/null ; then -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
