summaryrefslogtreecommitdiffstats
path: root/lib/puppet/autoload.rb
diff options
context:
space:
mode:
Diffstat (limited to 'lib/puppet/autoload.rb')
-rw-r--r--lib/puppet/autoload.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/puppet/autoload.rb b/lib/puppet/autoload.rb
index 7e880b922..2604b3c91 100644
--- a/lib/puppet/autoload.rb
+++ b/lib/puppet/autoload.rb
@@ -76,8 +76,10 @@ class Puppet::Autoload
# aren't used.
name = File.basename(file).sub(".rb", '').intern
next if @loaded.include? name
+ next if $".include?(File.join(@path, name.to_s + ".rb"))
+ filepath = File.join(@path, name.to_s + ".rb")
begin
- Kernel.load file, @wrap
+ Kernel.require filepath
@loaded[name] = true
rescue => detail
if Puppet[:trace]