diff options
author | Jeff McCune <jeff@puppetlabs.com> | 2012-03-13 16:11:01 -0700 |
---|---|---|
committer | Jeff McCune <jeff@puppetlabs.com> | 2012-03-13 16:44:21 -0700 |
commit | ea43e86516f637f319ba2db3cece66e963a41bc7 (patch) | |
tree | fb257fc26ad669c6479dd5dd0d1e889d07e8fc0f /lib/facter/puppet_vardir.rb | |
parent | f7b8ab71cc869e944792d646e31136d590004850 (diff) | |
download | puppet-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/puppet_vardir.rb')
-rw-r--r-- | lib/facter/puppet_vardir.rb | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/lib/facter/puppet_vardir.rb b/lib/facter/puppet_vardir.rb index 755e33c..0e6af40 100644 --- a/lib/facter/puppet_vardir.rb +++ b/lib/facter/puppet_vardir.rb @@ -4,7 +4,17 @@ # regardless of the node's platform. # # The value should be directly usable in a File resource path attribute. -require 'facter/util/puppet_settings' + + +begin + require 'facter/util/puppet_settings' +rescue LoadError => e + # puppet apply does not add module lib directories to the $LOAD_PATH (See + # #4248). It should (in the future) but for the time being we need to be + # defensive which is what this rescue block is doing. + rb_file = File.join(File.dirname(__FILE__), 'util', 'puppet_settings.rb') + load rb_file if File.exists?(rb_file) or raise e +end Facter.add(:puppet_vardir) do setcode do |