diff options
| author | Luke Kanies <luke@madstop.com> | 2008-02-13 17:29:23 -0600 |
|---|---|---|
| committer | Luke Kanies <luke@madstop.com> | 2008-02-13 17:29:23 -0600 |
| commit | 892055709a7e0b628758d24aba7590fd3c78426b (patch) | |
| tree | 5db38e211c9eba3e1acc95856b2f97f82388cc30 /lib/puppet/util/autoload.rb | |
| parent | 482971103b436e030606371df69bf4dfbbf54a2c (diff) | |
| download | puppet-892055709a7e0b628758d24aba7590fd3c78426b.tar.gz puppet-892055709a7e0b628758d24aba7590fd3c78426b.tar.xz puppet-892055709a7e0b628758d24aba7590fd3c78426b.zip | |
Fixing #1064 -- providers et al are now autoloaded
from modules even when Autoload#loadall is used.
Diffstat (limited to 'lib/puppet/util/autoload.rb')
| -rw-r--r-- | lib/puppet/util/autoload.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/puppet/util/autoload.rb b/lib/puppet/util/autoload.rb index 5f13d936b..535d9ef2e 100644 --- a/lib/puppet/util/autoload.rb +++ b/lib/puppet/util/autoload.rb @@ -112,9 +112,8 @@ class Puppet::Util::Autoload Dir.glob("#{dir}/*.rb").each do |file| name = File.basename(file).sub(".rb", '').intern next if loaded?(name) - rubypath = File.join(@path, name.to_s) begin - Kernel.require rubypath + Kernel.require file loaded(name, file) rescue => detail if Puppet[:trace] |