diff options
| author | Luke Kanies <luke@madstop.com> | 2007-08-15 17:24:26 +0200 |
|---|---|---|
| committer | Luke Kanies <luke@madstop.com> | 2007-08-15 17:24:26 +0200 |
| commit | 6ff461b8c2fb026398626754f055fca32c7624a4 (patch) | |
| tree | fcca92078cae10d9c338e58753232d13ad6eb0b7 /lib/puppet/util/autoload.rb | |
| parent | 9208931005d55729f2f8f38ad618f019a910d778 (diff) | |
| parent | 58e3855bb1c98e45f7e366d0f1fc6d834e0e5e43 (diff) | |
| download | puppet-6ff461b8c2fb026398626754f055fca32c7624a4.tar.gz puppet-6ff461b8c2fb026398626754f055fca32c7624a4.tar.xz puppet-6ff461b8c2fb026398626754f055fca32c7624a4.zip | |
Merge branch 'master' of http://northstarlabs.net/git/puppet
Diffstat (limited to 'lib/puppet/util/autoload.rb')
| -rw-r--r-- | lib/puppet/util/autoload.rb | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/lib/puppet/util/autoload.rb b/lib/puppet/util/autoload.rb index 42aa56c32..be9e14671 100644 --- a/lib/puppet/util/autoload.rb +++ b/lib/puppet/util/autoload.rb @@ -141,7 +141,13 @@ class Puppet::Util::Autoload # The list of directories to search through for loadable plugins. def searchpath - [Puppet[:libdir], $:].flatten + # JJM: Search for optional lib directories in each module bundle. + module_lib_dirs = Puppet[:modulepath].split(":").collect do |d| + Dir.glob("%s/*/lib" % d).select do |f| + FileTest.directory?(f) + end + end.flatten + [module_lib_dirs, Puppet[:libdir], $:].flatten end end |