[Bash-completion-commits] [SCM] bash-completion branch, master, updated. 1.3-135-g3a39ac6

[Ville Skyttä]

The following commit has been merged in the master branch:
commit 3a39ac6676b64b3a70496f257d41069977ef0ab2
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Wed Apr 27 18:33:12 2011 +0300

    chsh: Use _allowed_users instead of plain compgen -u.

diff --git a/CHANGES b/CHANGES
index bcf6fca..a05b569 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,8 +2,8 @@ bash-completion (2.x)
 
   [ Ville Skyttä ]
   * Add pxz and reptyr completions.
-  * Improve aspell, gendiff, pack200, rsync, screen, smartctl, tar, unpack200,
-    xz, xzdec, and generic parsed and long option completions.
+  * Improve aspell, chsh, gendiff, pack200, rsync, screen, smartctl, tar,
+    unpack200, xz, xzdec, and generic parsed and long option completions.
   * Try harder to find the correct perl executable to run the perl helper with.
   * Drop rpm query support for rpm < 4.1.
   * Split rpm and rpmbuild completions and improve them both.
diff --git a/completions/chsh b/completions/chsh
index 5bf01ec..63f8198 100644
--- a/completions/chsh
+++ b/completions/chsh
@@ -21,7 +21,7 @@ _chsh()
         COMPREPLY=( $( compgen -W '--shell --list-shells --help --version' \
             -- "$cur" ) )
     else
-        COMPREPLY=( $( compgen -u -- "$cur" ) )
+        _allowed_users
     fi
 
     return 0
diff --git a/test/lib/completions/chsh.exp b/test/lib/completions/chsh.exp
index a26ac93..6736c18 100644
--- a/test/lib/completions/chsh.exp
+++ b/test/lib/completions/chsh.exp
@@ -17,7 +17,7 @@ assert_complete_any "chsh -s "
 sync_after_int
 
 
-assert_complete [exec bash -c "compgen -A user"] "chsh "
+assert_complete_any "chsh "
 
 
 sync_after_int

-- 
bash-completion