diff options
| author | Jeff McCune <jeff@puppetlabs.com> | 2012-03-13 17:48:09 -0700 |
|---|---|---|
| committer | Jeff McCune <jeff@puppetlabs.com> | 2012-03-13 17:48:09 -0700 |
| commit | 033eddadc2b3f72783056fe7c9d70f651bcdf857 (patch) | |
| tree | 04a0d7b3b488e41c3f553695bfbf4ec12f703952 /lib/facter/puppet_vardir.rb | |
| parent | f74705d6215dc1e9ce0b055e11702b3ea20b9ca5 (diff) | |
| parent | 6b8f9dd329b40e1598fffde540b7cd59ddae9c2e (diff) | |
| download | puppet-stdlib-033eddadc2b3f72783056fe7c9d70f651bcdf857.tar.gz puppet-stdlib-033eddadc2b3f72783056fe7c9d70f651bcdf857.tar.bz2 | |
Merge branch '2.3.x'
* 2.3.x:
Update CHANGELOG and Modulefile for 2.3.1
(#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 |