Merge branch '2.3.x'

* 2.3.x:
  Update CHANGELOG and Modulefile for 2.3.1
  (#13091) Fix LoadError exception with puppet apply

1 files changed, 13 insertions, 9 deletions

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