X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=3rdparty%2Fmodules%2Fstdlib%2Flib%2Ffacter%2Fpuppet_settings.rb;fp=3rdparty%2Fmodules%2Fstdlib%2Flib%2Ffacter%2Fpuppet_settings.rb;h=b9321893f42e433669a1c683474cd9eeb00caccf;hb=131e09855e065be940e104d9ab0f18940cc76257;hp=eac9e9753fdcf26265a0c9fbf918468e94783cf3;hpb=407d322498f4fde815abf381007fbecfe5c10b2b;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..b9321893f 100644
--- a/3rdparty/modules/stdlib/lib/facter/puppet_settings.rb
+++ b/3rdparty/modules/stdlib/lib/facter/puppet_settings.rb
@@ -13,10 +13,9 @@ 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.add(:puppet_vardir) do
   setcode do