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 | |
parent | f7b8ab71cc869e944792d646e31136d590004850 (diff) | |
parent | ea43e86516f637f319ba2db3cece66e963a41bc7 (diff) |
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
-rw-r--r-- | lib/facter/facter_dot_d.rb | 2 | ||||
-rw-r--r-- | lib/facter/puppet_vardir.rb | 12 | ||||
-rw-r--r-- | lib/facter/util/puppet_settings.rb | 22 |
3 files changed, 24 insertions, 12 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' 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 diff --git a/lib/facter/util/puppet_settings.rb b/lib/facter/util/puppet_settings.rb index c8c8363..1ad9452 100644 --- a/lib/facter/util/puppet_settings.rb +++ b/lib/facter/util/puppet_settings.rb @@ -1,15 +1,19 @@ module Facter module Util module PuppetSettings - class << self - def with_puppet - begin - Module.const_get("Puppet") - rescue NameError - nil - else - yield - end + # This method is intended to provide a convenient way to evaluate a + # Facter code block only if Puppet is loaded. This is to account for the + # situation where the fact happens to be in the load path, but Puppet is + # not loaded for whatever reason. Perhaps the user is simply running + # facter without the --puppet flag and they happen to be working in a lib + # directory of a module. + def self.with_puppet + begin + Module.const_get("Puppet") + rescue NameError + nil + else + yield end end end |