diff options
| author | Ken Barber <ken@bob.sh> | 2012-03-13 17:30:44 -0700 |
|---|---|---|
| committer | Ken Barber <ken@bob.sh> | 2012-03-13 17:30:44 -0700 |
| commit | b4b809ef1210180afc0e731c4ea708ff2fd5b9d6 (patch) | |
| tree | fb257fc26ad669c6479dd5dd0d1e889d07e8fc0f /lib/facter/puppet_vardir.rb | |
| parent | f7b8ab71cc869e944792d646e31136d590004850 (diff) | |
| parent | ea43e86516f637f319ba2db3cece66e963a41bc7 (diff) | |
| download | puppet-stdlib-b4b809ef1210180afc0e731c4ea708ff2fd5b9d6.tar.gz puppet-stdlib-b4b809ef1210180afc0e731c4ea708ff2fd5b9d6.tar.bz2 | |
Merge pull request #50 from jeffmccune/ticket/2.3.x/13091_stdlib_throws_a_loaderror_when_running_with_puppet_apply
(#13091) Fix LoadError exception with puppet apply
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 |