diff options
author | Peter Stephenson <pws@users.sourceforge.net> | 2009-07-14 08:57:12 +0000 |
---|---|---|
committer | Peter Stephenson <pws@users.sourceforge.net> | 2009-07-14 08:57:12 +0000 |
commit | 443a64d489394237a4eb7eca91ba81997fd691d7 (patch) | |
tree | 21bc8d5ece104a1e2578f550207e1b222b9ffe9d | |
parent | 3257f6b8d561cdf8805744d2a988b4bf414249fc (diff) | |
download | zsh-443a64d489394237a4eb7eca91ba81997fd691d7.tar.gz zsh-443a64d489394237a4eb7eca91ba81997fd691d7.tar.xz zsh-443a64d489394237a4eb7eca91ba81997fd691d7.zip |
Andy Spencer: 27148: ignore build directories when searching for
kernel modules in modutil completion
-rw-r--r-- | ChangeLog | 8 | ||||
-rw-r--r-- | Completion/Linux/Command/_modutils | 2 |
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index 8647869c1..4255d6fb3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2009-07-14 Peter Stephenson <pws@csr.com> + + * Andy Spencer: 27148: Completion/Linux/Command/_modutils: + ignore build as well as source directories when searching + recursively for modules. + 2009-07-12 Peter Stephenson <p.w.stephenson@ntlworld.com> * 27135: Doc/Zsh/options.yo, Src/exec.c, Src/jobs.c: expand @@ -11980,5 +11986,5 @@ ***************************************************** * This is used by the shell to define $ZSH_PATCHLEVEL -* $Revision: 1.4739 $ +* $Revision: 1.4740 $ ***************************************************** diff --git a/Completion/Linux/Command/_modutils b/Completion/Linux/Command/_modutils index 879f64271..3ae76fec9 100644 --- a/Completion/Linux/Command/_modutils +++ b/Completion/Linux/Command/_modutils @@ -87,7 +87,7 @@ case "$state" in else kver=$(uname -r) fi - modules=( $modules_dir/$kver/(*~source)/**/*(.:t:r) ) + modules=( $modules_dir/$kver/(*~(source|build))/**/*(.:t:r) ) if [[ $state = loadable_modules ]]; then modules=( ${modules:#(${(j:|:)~${=loaded_modules//_/-}})} ) |