Hello community,

here is the log from the commit of package aaa_base for openSUSE:Factory
checked in at Fri May 6 14:23:41 CEST 2011.



--------
--- aaa_base/aaa_base.changes   2011-05-05 12:42:07.000000000 +0200
+++ /mounts/work_src_done/STABLE/aaa_base/aaa_base.changes      2011-05-06 
12:06:42.000000000 +0200
@@ -1,0 +2,6 @@
+Fri May  6 09:05:55 UTC 2011 - wer...@suse.de
+
+- Avoid further trouble of the plusdir complete option of the bash
+  (bug #681687)
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ aaa_base.spec ++++++
--- /var/tmp/diff_new_pack.yUsO7g/_old  2011-05-06 14:22:21.000000000 +0200
+++ /var/tmp/diff_new_pack.yUsO7g/_new  2011-05-06 14:22:21.000000000 +0200
@@ -21,7 +21,7 @@
 
 Name:           aaa_base
 Version:        11.5
-Release:        73
+Release:        75
 License:        GPLv2+
 Group:          System/Fhs
 Url:            http://gitorious.org/opensuse/aaa_base

++++++ 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      2011-05-05 
12:38:23.000000000 +0200
+++ new/aaa_base/files/etc/profile.d/complete.bash      2011-05-06 
11:00:57.000000000 +0200
@@ -89,15 +89,41 @@
     *[*?[]*)   COMPREPLY=()                            # use bashdefault
                test $g -eq 0 && shopt -u extglob
                return 0                                                ;;
-    \$\(*\))   eval COMPREPLY=\(${c}\) ;;
-    \$\(*)     COMPREPLY=($(compgen -c -P '$(' -S ')'  -- ${c#??}))    ;;
-    \`*\`)     eval COMPREPLY=\(${c}\) ;;
-    \`*)       COMPREPLY=($(compgen -c -P '\`' -S '\`' -- ${c#?}))     ;;
+    \$\(*\))   eval COMPREPLY=\(${c}\)
+               compopt +o plusdirs                                     ;;
+    \$\(*)     COMPREPLY=($(compgen -c -P '$(' -S ')'  -- ${c#??}))
+               if ((${#COMPREPLY[@]} > 0)) ; then
+                   compopt +o plusdirs
+                   let isdir++
+               fi                                                      ;;
+    \`*\`)     eval COMPREPLY=\(${c}\)
+               compopt +o plusdirs                                     ;;
+    \`*)       COMPREPLY=($(compgen -c -P '\`' -S '\`' -- ${c#?}))
+               if ((${#COMPREPLY[@]} > 0)) ; then
+                   compopt +o plusdirs
+                   let isdir++
+               fi                                                      ;;
     \$\{*\})   eval COMPREPLY=\(${c}\) ;;
-    \$\{*)     COMPREPLY=($(compgen -v -P '${' -S '}'  -- ${c#??}))    ;;
+    \$\{*)     COMPREPLY=($(compgen -v -P '${' -S '}'  -- ${c#??}))
+               if ((${#COMPREPLY[@]} > 0)) ; then
+                   compopt +o plusdirs
+                   if ((${#COMPREPLY[@]} > 1)) ; then
+                       test $g -eq 0 && shopt -u extglob
+                       return 0
+                   fi
+                   let isdir++
+                   eval COMPREPLY=\(${COMPREPLY[@]}\)
+               fi                                                      ;;
     \$*)       COMPREPLY=($(compgen -v -P '$' $s       -- ${c#?}))
-               eval COMPREPLY=\(${COMPREPLY[@]}\)
-               ((${#COMPREPLY[@]} == 0)) || let isdir++                ;;
+               if ((${#COMPREPLY[@]} > 0)) ; then
+                   compopt +o plusdirs
+                   if ((${#COMPREPLY[@]} > 1)) ; then
+                       test $g -eq 0 && shopt -u extglob
+                       return 0
+                   fi
+                   let isdir++
+                   eval COMPREPLY=\(${COMPREPLY[@]}\)
+               fi                                                      ;;
     \~*/*)     COMPREPLY=($(compgen -d $s              -- "${c}"))
                if ((${#COMPREPLY[@]} > 0)) ; then
                    compopt +o plusdirs


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

Reply via email to