diff options
| author | Luke Kanies <luke@madstop.com> | 2007-10-04 00:02:24 -0500 |
|---|---|---|
| committer | Luke Kanies <luke@madstop.com> | 2007-10-04 00:02:24 -0500 |
| commit | bd8e38236a23ae687c418fcbb90e5f61c8c67b01 (patch) | |
| tree | 4098acdd5e2a3d17c3b3e05c2c3df13f658d5f5e /lib/puppet/util/autoload.rb | |
| parent | 938f051256f206e01039d2c5142b2328fc25e639 (diff) | |
| parent | 35718437c40ab4228bd58eabf89728b7d0919e50 (diff) | |
| download | puppet-bd8e38236a23ae687c418fcbb90e5f61c8c67b01.tar.gz puppet-bd8e38236a23ae687c418fcbb90e5f61c8c67b01.tar.xz puppet-bd8e38236a23ae687c418fcbb90e5f61c8c67b01.zip | |
Merge branch 'master' of ssh://reductivelabs.com/opt/rl/git/puppet
Diffstat (limited to 'lib/puppet/util/autoload.rb')
| -rw-r--r-- | lib/puppet/util/autoload.rb | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/lib/puppet/util/autoload.rb b/lib/puppet/util/autoload.rb index 280961837..a52575522 100644 --- a/lib/puppet/util/autoload.rb +++ b/lib/puppet/util/autoload.rb @@ -107,16 +107,11 @@ class Puppet::Util::Autoload # Load every instance of everything we can find. eachdir do |dir| Dir.glob("#{dir}/*.rb").each do |file| - # Load here, rather than require, so that facts - # can be reloaded. This has some short-comings, I - # believe, but it works as long as real classes - # aren't used. name = File.basename(file).sub(".rb", '').intern next if loaded?(name) - next if $".include?(File.join(@path, name.to_s + ".rb")) - filepath = File.join(@path, name.to_s + ".rb") + rubypath = File.join(@path, name.to_s) begin - Kernel.require file + Kernel.require rubypath loaded(name, file) rescue => detail if Puppet[:trace] |