summaryrefslogtreecommitdiffstats
path: root/lib/facter/util/loader.rb
diff options
context:
space:
mode:
Diffstat (limited to 'lib/facter/util/loader.rb')
-rw-r--r--lib/facter/util/loader.rb15
1 files changed, 3 insertions, 12 deletions
diff --git a/lib/facter/util/loader.rb b/lib/facter/util/loader.rb
index 44a0338..c6013cc 100644
--- a/lib/facter/util/loader.rb
+++ b/lib/facter/util/loader.rb
@@ -51,18 +51,9 @@ class Facter::Util::Loader
result += ENV["FACTERLIB"].split(":")
end
- # LAK:NOTE We have to be this careful because facter gets loaded
- # *very* early in Puppet's lifecycle, and this essentially
- # builds interdependencies between the applications, which is
- # tricky.
- if defined?(Puppet) and Puppet.respond_to?(:settings)
- if f = Puppet.settings.value(:factdest)
- result << f
- end
- if l = Puppet.settings.value(:libdir)
- result << File.join(l, "facter")
- end
- end
+ # This allows others to register additional paths we should search.
+ result += Facter.search_path
+
result
end