summaryrefslogtreecommitdiff
path: root/lib/facter/facter_dot_d.rb
diff options
context:
space:
mode:
authorJeff McCune <jeff@puppetlabs.com>2012-03-13 16:11:01 -0700
committerJeff McCune <jeff@puppetlabs.com>2012-03-13 16:44:21 -0700
commitea43e86516f637f319ba2db3cece66e963a41bc7 (patch)
treefb257fc26ad669c6479dd5dd0d1e889d07e8fc0f /lib/facter/facter_dot_d.rb
parentf7b8ab71cc869e944792d646e31136d590004850 (diff)
downloadpuppet-stdlib-ea43e86516f637f319ba2db3cece66e963a41bc7.tar.gz
puppet-stdlib-ea43e86516f637f319ba2db3cece66e963a41bc7.tar.bz2
(#13091) Fix LoadError exception with puppet apply
Puppet apply does not add the stdlib lib directory to the $LOAD_PATH. This is a problem because the puppet_vardir fact requires the puppet_settings library to be available for the `with_puppet` utility method. Without this patch, puppet apply will result in the following error: $ puppet apply --modulepath=/vagrant/modules -e 'notice $puppet_vardir' warning: Could not load fact file stdlib/lib/facter/puppet_vardir.rb: no such file to load -- facter/util/puppet_settings notice: Scope(Class[main]): notice: Finished catalog run in 0.01 seconds With this patch applied, puppet apply works as expected: $ puppet apply --modulepath=/vagrant/modules.pe -e 'notice $puppet_vardir' notice: Scope(Class[main]): /Users/jeff/.puppet/var notice: Finished catalog run in 0.01 seconds This patch defensively tries to load facter/util/puppet_settings. If it cannot load it, it falls back to trying to explicitly locate and load the library. Once puppet is fixed such that a modules lib directory is truly in the $LOAD_PATH, the fall back implementation will no longer be exercised since the LoadError should not be raised.
Diffstat (limited to 'lib/facter/facter_dot_d.rb')
-rw-r--r--lib/facter/facter_dot_d.rb2
1 files changed, 0 insertions, 2 deletions
diff --git a/lib/facter/facter_dot_d.rb b/lib/facter/facter_dot_d.rb
index 8543c7c..3e528ab 100644
--- a/lib/facter/facter_dot_d.rb
+++ b/lib/facter/facter_dot_d.rb
@@ -12,8 +12,6 @@
# 600 file and will have the end result of not calling your
# fact scripts more often than is needed
-require 'facter/util/puppet_settings'
-
class Facter::Util::DotD
require 'yaml'