diff options
| author | Markus Roberts <Markus@reality.com> | 2010-01-22 12:55:14 -0800 |
|---|---|---|
| committer | James Turnbull <james@lovedthanlost.net> | 2010-01-30 09:35:58 +1100 |
| commit | f9e05a8062423cf0e4dd6dca2050a8c7d4b2e85d (patch) | |
| tree | 4865bd1bd076c5117b8a125ff41323e72e1c4c8c /lib/puppet/util/autoload.rb | |
| parent | b473264fe76f92b8eddeed7175c4283c9f8484d2 (diff) | |
| download | puppet-f9e05a8062423cf0e4dd6dca2050a8c7d4b2e85d.tar.gz puppet-f9e05a8062423cf0e4dd6dca2050a8c7d4b2e85d.tar.xz puppet-f9e05a8062423cf0e4dd6dca2050a8c7d4b2e85d.zip | |
Fix for #3094 (libdir should take ":" delimited path)
Actually, File::PATH_SEPARATOR, which is generally, but not always, ":").
Since libdir is also the default for the plugin handler, users will need to
specify it explicitly if a multipart libdir is given (and it will need to be
one of the segments given in the libdir for the plugins to be found).
Diffstat (limited to 'lib/puppet/util/autoload.rb')
| -rw-r--r-- | lib/puppet/util/autoload.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/puppet/util/autoload.rb b/lib/puppet/util/autoload.rb index 51fdaadad..ceaabe46a 100644 --- a/lib/puppet/util/autoload.rb +++ b/lib/puppet/util/autoload.rb @@ -156,7 +156,7 @@ class Puppet::Util::Autoload end end - def search_directories - [module_directories, Puppet[:libdir], $:].flatten + def search_directories(dummy_argument=:work_arround_for_ruby_GC_bug) + [module_directories, Puppet[:libdir].split(File::PATH_SEPARATOR), $:].flatten end end |