X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=3rdparty%2Fmodules%2Fstdlib%2Flib%2Ffacter%2Fpuppet_settings.rb;h=1ab3d8c8777267e0cb0a10647a17fc0cc7c75d84;hb=30caaa85aed7015ca0d77216bff175eebd917eb7;hp=eac9e9753fdcf26265a0c9fbf918468e94783cf3;hpb=6963202b4b62c2816655ac9532521b018fdf83bd;p=mirror%2Fdsa-puppet.git

diff --git a/3rdparty/modules/stdlib/lib/facter/puppet_settings.rb b/3rdparty/modules/stdlib/lib/facter/puppet_settings.rb
index eac9e9753..1ab3d8c87 100644
--- a/3rdparty/modules/stdlib/lib/facter/puppet_settings.rb
+++ b/3rdparty/modules/stdlib/lib/facter/puppet_settings.rb
@@ -13,11 +13,10 @@ rescue LoadError => e
   # #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
+  load rb_file if File.exist?(rb_file) || raise(e)
 end
 
-
-# These will be nil if Puppet is not available.
+# Facter fact returns the value of the Puppet vardir
 Facter.add(:puppet_vardir) do
   setcode do
     Facter::Util::PuppetSettings.with_puppet do
@@ -26,6 +25,7 @@ Facter.add(:puppet_vardir) do
   end
 end
 
+# Facter fact returns the value of the Puppet environment path
 Facter.add(:puppet_environmentpath) do
   setcode do
     Facter::Util::PuppetSettings.with_puppet do
@@ -34,6 +34,7 @@ Facter.add(:puppet_environmentpath) do
   end
 end
 
+# Facter fact returns the value of the Puppet server
 Facter.add(:puppet_server) do
   setcode do
     Facter::Util::PuppetSettings.with_puppet do