puppet 8.5.1-universal-darwin → 8.6.0-universal-darwin

data/lib/puppet/file_system/windows.rb

@@ -11,7 +11,7 @@ class Puppet::FileSystem::Windows < Puppet::FileSystem::Posix
     # PUP-6959 mode is explicitly ignored until it can be implemented
     # Ruby on Windows uses mode for setting file attributes like read-only and
     # archived, not for setting permissions like POSIX
-    raise TypeError.new('mode must be specified as an Integer') if mode && !mode.is_a?(Numeric)
+    raise TypeError, 'mode must be specified as an Integer' if mode && !mode.is_a?(Numeric)
 
     ::File.open(path, options, nil, &block)
   end
@@ -20,7 +20,7 @@ class Puppet::FileSystem::Windows < Puppet::FileSystem::Posix
     # ensure `nil` values behave like underlying File.expand_path
     string_path = ::File.expand_path(path.nil? ? nil : path_string(path), dir_string)
     # if no tildes, nothing to expand, no need to call Windows API, return original string
-    return string_path if !string_path.index('~')
+    return string_path unless string_path.index('~')
 
     begin
       # no need to do existence check up front as GetLongPathName implies that check is performed
@@ -28,15 +28,15 @@ class Puppet::FileSystem::Windows < Puppet::FileSystem::Posix
       string_path = Puppet::Util::Windows::File.get_long_pathname(string_path)
     rescue Puppet::Util::Windows::Error => e
       # preserve original File.expand_path behavior for file / path not found by returning string
-      raise if (e.code != Puppet::Util::Windows::File::ERROR_FILE_NOT_FOUND &&
-        e.code != Puppet::Util::Windows::File::ERROR_PATH_NOT_FOUND)
+      raise if e.code != Puppet::Util::Windows::File::ERROR_FILE_NOT_FOUND &&
+               e.code != Puppet::Util::Windows::File::ERROR_PATH_NOT_FOUND
     end
 
     string_path
   end
 
   def exist?(path)
-    return Puppet::Util::Windows::File.exist?(path)
+    Puppet::Util::Windows::File.exist?(path)
   end
 
   def symlink(path, dest, options = {})
@@ -61,7 +61,7 @@ class Puppet::FileSystem::Windows < Puppet::FileSystem::Posix
   end
 
   def symlink?(path)
-    return false if !Puppet.features.manages_symlinks?
+    return false unless Puppet.features.manages_symlinks?
 
     Puppet::Util::Windows::File.symlink?(path)
   end
@@ -72,22 +72,30 @@ class Puppet::FileSystem::Windows < Puppet::FileSystem::Posix
   end
 
   def unlink(*file_names)
-    if !Puppet.features.manages_symlinks?
+    unless Puppet.features.manages_symlinks?
       return ::File.unlink(*file_names)
     end
 
     file_names.each do |file_name|
       file_name = file_name.to_s # handle PathName
-      stat = Puppet::Util::Windows::File.stat(file_name) rescue nil
+      stat = begin
+        Puppet::Util::Windows::File.stat(file_name)
+      rescue
+        nil
+      end
 
       # sigh, Ruby + Windows :(
       if !stat
-        ::File.unlink(file_name) rescue Dir.rmdir(file_name)
+        begin
+          ::File.unlink(file_name)
+        rescue
+          Dir.rmdir(file_name)
+        end
       elsif stat.ftype == 'directory'
         if Puppet::Util::Windows::File.symlink?(file_name)
           Dir.rmdir(file_name)
         else
-          raise Errno::EPERM.new(file_name)
+          raise Errno::EPERM, file_name
         end
       else
         ::File.unlink(file_name)
@@ -102,7 +110,7 @@ class Puppet::FileSystem::Windows < Puppet::FileSystem::Posix
   end
 
   def lstat(path)
-    if !Puppet.features.manages_symlinks?
+    unless Puppet.features.manages_symlinks?
       return Puppet::Util::Windows::File.stat(path)
     end
 
@@ -133,14 +141,14 @@ class Puppet::FileSystem::Windows < Puppet::FileSystem::Posix
     end
 
     current_sid = Puppet::Util::Windows::SID.name_to_sid(Puppet::Util::Windows::ADSI::User.current_user_name)
-    current_sid = Puppet::Util::Windows::SID.name_to_sid(Puppet::Util::Windows::ADSI::User.current_sam_compatible_user_name) unless current_sid
+    current_sid ||= Puppet::Util::Windows::SID.name_to_sid(Puppet::Util::Windows::ADSI::User.current_sam_compatible_user_name)
 
     dacl = case mode
-           when 0644
+           when 0o644
              dacl = secure_dacl(current_sid)
              dacl.allow(Puppet::Util::Windows::SID::BuiltinUsers, FILE_READ)
              dacl
-           when 0660, 0640, 0600, 0440
+           when 0o660, 0o640, 0o600, 0o440
              secure_dacl(current_sid)
            when nil
              get_dacl_from_file(path) || secure_dacl(current_sid)
@@ -172,7 +180,7 @@ class Puppet::FileSystem::Windows < Puppet::FileSystem::Posix
     when ACCESS_DENIED, SHARING_VIOLATION, LOCK_VIOLATION
       raise Errno::EACCES.new(path_string(path), e)
     else
-      raise SystemCallError.new(e.message)
+      raise SystemCallError, e.message
     end
   end
 
@@ -204,12 +212,12 @@ class Puppet::FileSystem::Windows < Puppet::FileSystem::Posix
   end
 
   def raise_if_symlinks_unsupported
-    if !Puppet.features.manages_symlinks?
+    unless Puppet.features.manages_symlinks?
       msg = _("This version of Windows does not support symlinks.  Windows Vista / 2008 or higher is required.")
-      raise Puppet::Util::Windows::Error.new(msg)
+      raise Puppet::Util::Windows::Error, msg
     end
 
-    if !Puppet::Util::Windows::Process.process_privilege_symlink?
+    unless Puppet::Util::Windows::Process.process_privilege_symlink?
       Puppet.warning _("The current user does not have the necessary permission to manage symlinks.")
     end
   end

data/lib/puppet/forge/cache.rb

@@ -38,12 +38,12 @@ class Puppet::Forge
 
     # Return contents of file at the given URI's +uri+.
     def read_retrieve(uri)
-      return uri.read
+      uri.read
     end
 
     # Return Pathname for repository's cache directory, create it if needed.
     def path
-      (self.class.base_path + @repository.cache_key).tap { |o| o.mkpath }
+      (self.class.base_path + @repository.cache_key).tap(&:mkpath)
     end
 
     # Return the base Pathname for all the caches.

data/lib/puppet/forge/errors.rb

@@ -13,7 +13,7 @@ module Puppet::Forge::Errors
     #
     # @return [String] the multiline version of the error message
     def multiline
-      self.message
+      message
     end
   end
 

data/lib/puppet/forge/repository.rb

@@ -69,7 +69,7 @@ class Puppet::Forge
     # repository at +release+ (e.g. "myuser-mymodule").
     def retrieve(release)
       path = @host.chomp('/') + release
-      return cache.retrieve(path)
+      cache.retrieve(path)
     end
 
     # Return the URI string for this repository.
@@ -80,7 +80,7 @@ class Puppet::Forge
     # Return the cache key for this repository, this a hashed string based on
     # the URI.
     def cache_key
-      return @cache_key ||= [
+      @cache_key ||= [
         @host.to_s.gsub(/[^[:alnum:]]+/, '_').sub(/_$/, ''),
         Digest::SHA1.hexdigest(@host.to_s)
       ].join('-').freeze

data/lib/puppet/forge.rb

@@ -114,7 +114,7 @@ class Puppet::Forge < SemanticPuppet::Dependency::Source
       uri = decode_uri(response['pagination']['next'])
     end
 
-    return releases
+    releases
   end
 
   def make_http_request(*args)
@@ -134,13 +134,11 @@ class Puppet::Forge < SemanticPuppet::Dependency::Source
 
       if meta['dependencies']
         dependencies = meta['dependencies'].collect do |dep|
-          begin
-            Puppet::ModuleTool::Metadata.new.add_dependency(dep['name'], dep['version_requirement'], dep['repository'])
-            Puppet::ModuleTool.parse_module_dependency(release, dep)[0..1]
-          rescue ArgumentError => e
-            raise ArgumentError, _("Malformed dependency: %{name}.") % { name: dep['name'] } +
-                                 ' ' + _("Exception was: %{detail}") % { detail: e }
-          end
+          Puppet::ModuleTool::Metadata.new.add_dependency(dep['name'], dep['version_requirement'], dep['repository'])
+          Puppet::ModuleTool.parse_module_dependency(release, dep)[0..1]
+        rescue ArgumentError => e
+          raise ArgumentError, _("Malformed dependency: %{name}.") % { name: dep['name'] } +
+                               ' ' + _("Exception was: %{detail}") % { detail: e }
         end
       else
         dependencies = []
@@ -150,7 +148,7 @@ class Puppet::Forge < SemanticPuppet::Dependency::Source
     end
 
     def install(dir)
-      staging_dir = self.prepare
+      staging_dir = prepare
 
       module_dir = dir + name[/-(.*)/, 1]
       module_dir.rmtree if module_dir.exist?
@@ -163,7 +161,7 @@ class Puppet::Forge < SemanticPuppet::Dependency::Source
 
       # Return the Pathname object representing the directory where the
       # module release archive was unpacked the to.
-      return module_dir
+      module_dir
     ensure
       staging_dir.rmtree if staging_dir.exist?
     end
@@ -202,9 +200,7 @@ class Puppet::Forge < SemanticPuppet::Dependency::Source
     end
 
     def tmpfile
-      @file ||= Tempfile.new(name, Puppet::Forge::Cache.base_path).tap do |f|
-        f.binmode
-      end
+      @file ||= Tempfile.new(name, Puppet::Forge::Cache.base_path).tap(&:binmode)
     end
     # rubocop:enable Naming/MemoizedInstanceVariableName
 
@@ -227,15 +223,13 @@ class Puppet::Forge < SemanticPuppet::Dependency::Source
     end
 
     def unpack(file, destination)
-      begin
-        Puppet::ModuleTool::Applications::Unpacker.unpack(file.path, destination)
-      rescue Puppet::ExecutionFailure => e
-        raise RuntimeError, _("Could not extract contents of module archive: %{message}") % { message: e.message }
-      end
+      Puppet::ModuleTool::Applications::Unpacker.unpack(file.path, destination)
+    rescue Puppet::ExecutionFailure => e
+      raise RuntimeError, _("Could not extract contents of module archive: %{message}") % { message: e.message }
     end
 
     def deprecated?
-      @data['module'] && (@data['module']['deprecated_at'] != nil)
+      @data['module'] && !@data['module']['deprecated_at'].nil?
     end
   end
 

data/lib/puppet/functions/abs.rb

@@ -53,9 +53,9 @@ Puppet::Functions.create_function(:abs) do
     # version of this function.
     #
     case x
-    when %r{^-?(?:\d+)(?:\.\d+){1}$}
+    when /^-?(?:\d+)(?:\.\d+){1}$/
       x.to_f.abs
-    when %r{^-?\d+$}
+    when /^-?\d+$/
       x.to_i.abs
     else
       raise(ArgumentError, 'abs(): Requires float or integer to work with - was given non decimal string')

data/lib/puppet/functions/camelcase.rb

@@ -49,7 +49,7 @@ Puppet::Functions.create_function(:camelcase) do
   end
 
   def on_string(s)
-    s.split('_').map { |x| x.capitalize }.join('')
+    s.split('_').map(&:capitalize).join('')
   end
 
   def on_iterable(a)

data/lib/puppet/functions/compare.rb

@@ -98,7 +98,7 @@ Puppet::Functions.create_function(:compare) do
   end
 
   def on_error(a, b, *ignore_case)
-    if !ignore_case.empty?
+    unless ignore_case.empty?
       unless a.is_a?(String) && b.is_a?(String)
         # TRANSLATORS 'compare' is a name
         return _("compare(): The third argument (ignore case) can only be used when comparing strings")
@@ -115,7 +115,7 @@ Puppet::Functions.create_function(:compare) do
 
     if a.class != b.class
       # TRANSLATORS 'compare' is a name
-      return _("compare(): Can only compare values of the same type (or for Timestamp/Timespan also against Numeric). Got %{type_a} and %{type_b}") % {
+      _("compare(): Can only compare values of the same type (or for Timestamp/Timespan also against Numeric). Got %{type_a} and %{type_b}") % {
         type_a: type_label(a), type_b: type_label(b)
       }
     end

data/lib/puppet/functions/contain.rb

@@ -48,7 +48,7 @@ Puppet::Functions.create_function(:contain, Puppet::Functions::InternalFunction)
     # This is the same as calling the include function but faster and does not rely on the include
     # function.
     (scope.compiler.evaluate_classes(classes, scope, false) || []).each do |resource|
-      if !scope.catalog.edge?(containing_resource, resource)
+      unless scope.catalog.edge?(containing_resource, resource)
         scope.catalog.add_edge(containing_resource, resource)
       end
     end

data/lib/puppet/functions/defined.rb

@@ -101,7 +101,7 @@
 # @since 3.8.1 type specific requests with future parser
 # @since 4.0.0
 #
-Puppet::Functions.create_function(:'defined', Puppet::Functions::InternalFunction) do
+Puppet::Functions.create_function(:defined, Puppet::Functions::InternalFunction) do
   dispatch :is_defined do
     scope_param
     required_repeated_param 'Variant[String, Type[CatalogEntry], Type[Type[CatalogEntry]]]', :vals
@@ -112,7 +112,7 @@ Puppet::Functions.create_function(:'defined', Puppet::Functions::InternalFunctio
       case val
       when String
         if val =~ /^\$(.+)$/
-          scope.exist?($1)
+          scope.exist?(Regexp.last_match(1))
         else
           case val
           when ''

data/lib/puppet/functions/dig.rb

@@ -40,7 +40,7 @@ Puppet::Functions.create_function(:dig) do
     args.reduce(data) do |d, k|
       return nil if d.nil? || k.nil?
 
-      if !(d.is_a?(Array) || d.is_a?(Hash))
+      unless d.is_a?(Array) || d.is_a?(Hash)
         t = Puppet::Pops::Types::TypeCalculator.infer(d)
         msg = _("The given data does not contain a Collection at %{walked_path}, got '%{type}'") % { walked_path: walked_path, type: t }
         error_data = Puppet::DataTypes::Error.new(

data/lib/puppet/functions/eyaml_lookup_key.rb

@@ -47,21 +47,19 @@ Puppet::Functions.create_function(:eyaml_lookup_key) do
   def load_data_hash(options, context)
     path = options['path']
     context.cached_file_data(path) do |content|
-      begin
-        data = Puppet::Util::Yaml.safe_load(content, [Symbol], path)
-        if data.is_a?(Hash)
-          Puppet::Pops::Lookup::HieraConfig.symkeys_to_string(data)
-        else
-          msg = _("%{path}: file does not contain a valid yaml hash") % { path: path }
-          raise Puppet::DataBinding::LookupError, msg if Puppet[:strict] == :error && data != false
+      data = Puppet::Util::Yaml.safe_load(content, [Symbol], path)
+      if data.is_a?(Hash)
+        Puppet::Pops::Lookup::HieraConfig.symkeys_to_string(data)
+      else
+        msg = _("%{path}: file does not contain a valid yaml hash") % { path: path }
+        raise Puppet::DataBinding::LookupError, msg if Puppet[:strict] == :error && data != false
 
-          Puppet.warning(msg)
-          {}
-        end
-      rescue Puppet::Util::Yaml::YamlLoadError => ex
-        # YamlLoadErrors include the absolute path to the file, so no need to add that
-        raise Puppet::DataBinding::LookupError, _("Unable to parse %{message}") % { message: ex.message }
+        Puppet.warning(msg)
+        {}
       end
+    rescue Puppet::Util::Yaml::YamlLoadError => ex
+      # YamlLoadErrors include the absolute path to the file, so no need to add that
+      raise Puppet::DataBinding::LookupError, _("Unable to parse %{message}") % { message: ex.message }
     end
   end
 

data/lib/puppet/functions/get.rb

@@ -138,7 +138,7 @@ Puppet::Functions.create_function(:get, Puppet::Functions::InternalFunction) do
 
     begin
       result = call_function('dig', value, *segments)
-      return result.nil? ? default_value : result
+      result.nil? ? default_value : result
     rescue Puppet::ErrorWithData => e
       if block_given?
         yield(e.error_data)

data/lib/puppet/functions/hocon_data.rb

@@ -29,11 +29,9 @@ Puppet::Functions.create_function(:hocon_data) do
   def hocon_data(options, context)
     path = options['path']
     context.cached_file_data(path) do |content|
-      begin
-        Hocon.parse(content)
-      rescue Hocon::ConfigError => ex
-        raise Puppet::DataBinding::LookupError, _("Unable to parse (%{path}): %{message}") % { path: path, message: ex.message }
-      end
+      Hocon.parse(content)
+    rescue Hocon::ConfigError => ex
+      raise Puppet::DataBinding::LookupError, _("Unable to parse (%{path}): %{message}") % { path: path, message: ex.message }
     end
   end
 

data/lib/puppet/functions/import.rb

@@ -4,6 +4,6 @@
 #
 Puppet::Functions.create_function(:import) do
   def import(*args)
-    raise Puppet::Pops::SemanticError.new(Puppet::Pops::Issues::DISCONTINUED_IMPORT)
+    raise Puppet::Pops::SemanticError, Puppet::Pops::Issues::DISCONTINUED_IMPORT
   end
 end

data/lib/puppet/functions/json_data.rb

@@ -20,12 +20,10 @@ Puppet::Functions.create_function(:json_data) do
   def json_data(options, context)
     path = options['path']
     context.cached_file_data(path) do |content|
-      begin
-        Puppet::Util::Json.load(content)
-      rescue Puppet::Util::Json::ParseError => ex
-        # Filename not included in message, so we add it here.
-        raise Puppet::DataBinding::LookupError, "Unable to parse (%{path}): %{message}" % { path: path, message: ex.message }
-      end
+      Puppet::Util::Json.load(content)
+    rescue Puppet::Util::Json::ParseError => ex
+      # Filename not included in message, so we add it here.
+      raise Puppet::DataBinding::LookupError, "Unable to parse (%{path}): %{message}" % { path: path, message: ex.message }
     end
   end
 

data/lib/puppet/functions/max.rb

@@ -146,7 +146,7 @@ Puppet::Functions.create_function(:max) do
     assert_arg_count(args)
 
     args.max do |a, b|
-      if a.to_s =~ %r{\A^-?\d+([._eE]\d+)?\z} && b.to_s =~ %r{\A-?\d+([._eE]\d+)?\z}
+      if a.to_s =~ /\A^-?\d+([._eE]\d+)?\z/ && b.to_s =~ /\A-?\d+([._eE]\d+)?\z/
         Puppet.warn_once('deprecations', 'max_function_numeric_coerce_string',
                          _("The max() function's auto conversion of String to Numeric is deprecated - change to convert input before calling, or use lambda"))
         a.to_f <=> b.to_f
@@ -232,7 +232,7 @@ Puppet::Functions.create_function(:max) do
     args.max do |a, b|
       as = a.to_s
       bs = b.to_s
-      if as =~ %r{\A^-?\d+([._eE]\d+)?\z} && bs =~ %r{\A-?\d+([._eE]\d+)?\z}
+      if as =~ /\A^-?\d+([._eE]\d+)?\z/ && bs =~ /\A-?\d+([._eE]\d+)?\z/
         Puppet.warn_once('deprecations', 'max_function_numeric_coerce_string',
                          _("The max() function's auto conversion of String to Numeric is deprecated - change to convert input before calling, or use lambda"))
         a.to_f <=> b.to_f

data/lib/puppet/functions/min.rb

@@ -145,7 +145,7 @@ Puppet::Functions.create_function(:min) do
     assert_arg_count(args)
 
     args.min do |a, b|
-      if a.to_s =~ %r{\A^-?\d+([._eE]\d+)?\z} && b.to_s =~ %r{\A-?\d+([._eE]\d+)?\z}
+      if a.to_s =~ /\A^-?\d+([._eE]\d+)?\z/ && b.to_s =~ /\A-?\d+([._eE]\d+)?\z/
         Puppet.warn_once('deprecations', 'min_function_numeric_coerce_string',
                          _("The min() function's auto conversion of String to Numeric is deprecated - change to convert input before calling, or use lambda"))
         a.to_f <=> b.to_f
@@ -231,7 +231,7 @@ Puppet::Functions.create_function(:min) do
     args.min do |a, b|
       as = a.to_s
       bs = b.to_s
-      if as =~ %r{\A^-?\d+([._eE]\d+)?\z} && bs =~ %r{\A-?\d+([._eE]\d+)?\z}
+      if as =~ /\A^-?\d+([._eE]\d+)?\z/ && bs =~ /\A-?\d+([._eE]\d+)?\z/
         Puppet.warn_once('deprecations', 'min_function_numeric_coerce_string',
                          _("The min() function's auto conversion of String to Numeric is deprecated - change to convert input before calling, or use lambda"))
         a.to_f <=> b.to_f

data/lib/puppet/functions/new.rb

@@ -994,7 +994,7 @@ Puppet::Functions.create_function(:new, Puppet::Functions::InternalFunction) do
     return args[0] if args.size == 1 && !t.is_a?(Puppet::Pops::Types::PInitType) && t.instance?(args[0])
 
     result = assert_type(t, new_function_for_type(t).call(scope, *args))
-    return block_given? ? yield(result) : result
+    block_given? ? yield(result) : result
   end
 
   def new_function_for_type(t)

data/lib/puppet/functions/reduce.rb

@@ -142,22 +142,18 @@ Puppet::Functions.create_function(:reduce) do
   def reduce_without_memo(enumerable)
     enum = Puppet::Pops::Types::Iterable.asserted_iterable(self, enumerable)
     enum.reduce do |memo, x|
-      begin
-        yield(memo, x)
-      rescue StopIteration
-        return memo
-      end
+      yield(memo, x)
+    rescue StopIteration
+      return memo
     end
   end
 
   def reduce_with_memo(enumerable, given_memo)
     enum = Puppet::Pops::Types::Iterable.asserted_iterable(self, enumerable)
     enum.reduce(given_memo) do |memo, x|
-      begin
-        yield(memo, x)
-      rescue StopIteration
-        return memo
-      end
+      yield(memo, x)
+    rescue StopIteration
+      return memo
     end
   end
 end

data/lib/puppet/functions/regsubst.rb

@@ -78,7 +78,7 @@ Puppet::Functions.create_function(:regsubst) do
   def regsubst_string(target, pattern, replacement, flags = nil, encoding = nil)
     re_flags = 0
     operation = :sub
-    if !flags.nil?
+    unless flags.nil?
       flags.split(//).each do |f|
         case f
         when 'G' then operation = :gsub
@@ -92,7 +92,7 @@ Puppet::Functions.create_function(:regsubst) do
   end
 
   def regsubst_regexp(target, pattern, replacement, flags = nil)
-    pattern = (pattern.pattern || '') if pattern.is_a?(Puppet::Pops::Types::PRegexpType)
+    pattern = pattern.pattern || '' if pattern.is_a?(Puppet::Pops::Types::PRegexpType)
     inner_regsubst(target, pattern, replacement, flags == 'G' ? :gsub : :sub)
   end
 

data/lib/puppet/functions/require.rb

@@ -70,7 +70,7 @@ Puppet::Functions.create_function(:require, Puppet::Functions::InternalFunction)
     classes.each do |klass|
       # lookup the class in the scopes
       klass = (classobj = krt.find_hostclass(klass)) ? classobj.name : nil
-      raise Puppet::ParseError.new(_("Could not find class %{klass}") % { klass: klass }) unless klass
+      raise Puppet::ParseError, _("Could not find class %{klass}") % { klass: klass } unless klass
 
       ref = Puppet::Resource.new(:class, klass)
       resource = scope.resource

data/lib/puppet/functions/yaml_data.rb

@@ -22,21 +22,19 @@ Puppet::Functions.create_function(:yaml_data) do
   def yaml_data(options, context)
     path = options['path']
     context.cached_file_data(path) do |content|
-      begin
-        data = Puppet::Util::Yaml.safe_load(content, [Symbol], path)
-        if data.is_a?(Hash)
-          Puppet::Pops::Lookup::HieraConfig.symkeys_to_string(data)
-        else
-          msg = _("%{path}: file does not contain a valid yaml hash" % { path: path })
-          raise Puppet::DataBinding::LookupError, msg if Puppet[:strict] == :error && data != false
+      data = Puppet::Util::Yaml.safe_load(content, [Symbol], path)
+      if data.is_a?(Hash)
+        Puppet::Pops::Lookup::HieraConfig.symkeys_to_string(data)
+      else
+        msg = _("%{path}: file does not contain a valid yaml hash" % { path: path })
+        raise Puppet::DataBinding::LookupError, msg if Puppet[:strict] == :error && data != false
 
-          Puppet.warning(msg)
-          {}
-        end
-      rescue Puppet::Util::Yaml::YamlLoadError => ex
-        # YamlLoadErrors include the absolute path to the file, so no need to add that
-        raise Puppet::DataBinding::LookupError, _("Unable to parse %{message}") % { message: ex.message }
+        Puppet.warning(msg)
+        {}
       end
+    rescue Puppet::Util::Yaml::YamlLoadError => ex
+      # YamlLoadErrors include the absolute path to the file, so no need to add that
+      raise Puppet::DataBinding::LookupError, _("Unable to parse %{message}") % { message: ex.message }
     end
   end