puppet 8.5.0-universal-darwin → 8.6.0-universal-darwin

data/lib/puppet/property.rb

@@ -203,21 +203,19 @@ class Puppet::Property < Puppet::Parameter
   # @raise [Puppet::DevError] if there were issues formatting the message
   #
   def change_to_s(current_value, newvalue)
-    begin
-      if current_value == :absent
-        return "defined '#{name}' as #{should_to_s(newvalue)}"
-      elsif newvalue == :absent or newvalue == [:absent]
-        return "undefined '#{name}' from #{is_to_s(current_value)}"
-      else
-        return "#{name} changed #{is_to_s(current_value)} to #{should_to_s(newvalue)}"
-      end
-    rescue Puppet::Error
-      raise
-    rescue => detail
-      message = _("Could not convert change '%{name}' to string: %{detail}") % { name: name, detail: detail }
-      Puppet.log_exception(detail, message)
-      raise Puppet::DevError, message, detail.backtrace
+    if current_value == :absent
+      "defined '#{name}' as #{should_to_s(newvalue)}"
+    elsif newvalue == :absent or newvalue == [:absent]
+      "undefined '#{name}' from #{is_to_s(current_value)}"
+    else
+      "#{name} changed #{is_to_s(current_value)} to #{should_to_s(newvalue)}"
     end
+  rescue Puppet::Error
+    raise
+  rescue => detail
+    message = _("Could not convert change '%{name}' to string: %{detail}") % { name: name, detail: detail }
+    Puppet.log_exception(detail, message)
+    raise Puppet::DevError, message, detail.backtrace
   end
 
   # Produces the name of the event to use to describe a change of this property's value.
@@ -227,17 +225,17 @@ class Puppet::Property < Puppet::Parameter
   # @return [String] the name of the event that describes the change
   #
   def event_name
-    value = self.should
+    value = should
 
     event_name = self.class.value_option(value, :event) and return event_name
 
     name == :ensure or return (name.to_s + "_changed").to_sym
 
-    return (resource.type.to_s + case value
-                                 when :present; "_created"
-                                 when :absent;  "_removed"
-                                 else           "_changed"
-                                 end).to_sym
+    (resource.type.to_s + case value
+                          when :present; "_created"
+                          when :absent;  "_removed"
+                          else "_changed"
+                          end).to_sym
   end
 
   # Produces an event describing a change of this property.
@@ -308,7 +306,7 @@ class Puppet::Property < Puppet::Parameter
   # @api public
   #
   def insync?(is)
-    self.devfail "#{self.class.name}'s should is not array" unless @should.is_a?(Array)
+    devfail "#{self.class.name}'s should is not array" unless @should.is_a?(Array)
 
     # an empty array is analogous to no should values
     return true if @should.empty?
@@ -333,14 +331,14 @@ class Puppet::Property < Puppet::Parameter
       #
       # This does mean that property equality is not commutative, and will not
       # work unless the `is` value is carefully arranged to match the should.
-      return (is == @should or is == @should.map(&:to_s))
+      (is == @should or is == @should.map(&:to_s))
 
       # When we stop being idiots about this, and actually have meaningful
       # semantics, this version is the thing we actually want to do.
       #
       # return is.zip(@should).all? {|a, b| property_matches?(a, b) }
     else
-      return @should.any? { |want| property_matches?(is, want) }
+      @should.any? { |want| property_matches?(is, want) }
     end
   end
 
@@ -371,7 +369,7 @@ class Puppet::Property < Puppet::Parameter
       # avoid it
       # TRANSLATORS 'insync_values?' should not be translated
       msg = _("Unknown failure using insync_values? on type: %{type} / property: %{name} to compare values %{should} and %{is}") %
-            { type: self.resource.ref, name: self.name, should: should, is: is }
+            { type: resource.ref, name: name, should: should, is: is }
       Puppet.info(msg)
 
       # Return nil, ie. unknown
@@ -486,9 +484,9 @@ class Puppet::Property < Puppet::Parameter
     # Set a name for looking up associated options like the event.
     name = self.class.value_name(value)
     method = self.class.value_option(name, :method)
-    if method && self.respond_to?(method)
+    if method && respond_to?(method)
       begin
-        self.send(method)
+        send(method)
       rescue Puppet::Error
         raise
       rescue => detail
@@ -503,7 +501,7 @@ class Puppet::Property < Puppet::Parameter
       if block
         # FIXME It'd be better here to define a method, so that
         # the blocks could return values.
-        self.instance_eval(&block)
+        instance_eval(&block)
       else
         call_provider(value)
       end
@@ -526,12 +524,12 @@ class Puppet::Property < Puppet::Parameter
   def should
     return nil unless defined?(@should)
 
-    self.devfail "should for #{self.class.name} on #{resource.name} is not an array" unless @should.is_a?(Array)
+    devfail "should for #{self.class.name} on #{resource.name} is not an array" unless @should.is_a?(Array)
 
     if match_all?
-      return @should.collect { |val| self.unmunge(val) }
+      @should.collect { |val| unmunge(val) }
     else
-      return self.unmunge(@should[0])
+      unmunge(@should[0])
     end
   end
 
@@ -549,7 +547,7 @@ class Puppet::Property < Puppet::Parameter
     @shouldorig = values
 
     values.each { |val| validate(val) }
-    @should = values.collect { |val| self.munge(val) }
+    @should = values.collect { |val| munge(val) }
   end
 
   # Produces a pretty printing string for the given value.
@@ -591,7 +589,7 @@ class Puppet::Property < Puppet::Parameter
     features = self.class.value_option(self.class.value_name(value), :required_features)
     if features
       features = Array(features)
-      needed_features = features.collect { |f| f.to_s }.join(", ")
+      needed_features = features.collect(&:to_s).join(", ")
       unless provider.satisfies?(features)
         # TRANSLATORS 'Provider' refers to a Puppet provider class
         raise ArgumentError, _("Provider %{provider} must have features '%{needed_features}' to set '%{property}' to '%{value}'") %
@@ -602,7 +600,7 @@ class Puppet::Property < Puppet::Parameter
 
   # @return [Object, nil] Returns the wanted _(should)_ value of this property.
   def value
-    self.should
+    should
   end
 
   # (see #should=)

data/lib/puppet/provider/exec.rb

@@ -45,7 +45,7 @@ class Puppet::Provider::Exec < Puppet::Provider
 
     checkexe(command)
 
-    debug "Executing#{check ? " check" : ""} '#{sensitive ? '[redacted]' : command}'"
+    debug "Executing#{check ? ' check' : ''} '#{sensitive ? '[redacted]' : command}'"
 
     # Ruby 2.1 and later interrupt execution in a way that bypasses error
     # handling by default. Passing Timeout::Error causes an exception to be
@@ -82,7 +82,7 @@ class Puppet::Provider::Exec < Puppet::Provider
     # Return output twice as processstatus was returned before, but only exitstatus was ever called.
     # Output has the exitstatus on it so it is returned instead. This is here twice as changing this
     #  would result in a change to the underlying API.
-    return output, output
+    [output, output]
   end
 
   def extractexe(command)

data/lib/puppet/provider/file/posix.rb

@@ -27,15 +27,17 @@ Puppet::Type.type(:file).provide :posix do
     end
 
     if user.uid == ""
-      return nil
+      nil
     else
-      return user.name
+      user.name
     end
   end
 
   # Determine if the user is valid, and if so, return the UID
   def name2uid(value)
-    Integer(value) rescue uid(value) || false
+    Integer(value)
+  rescue
+    uid(value) || false
   end
 
   def gid2name(id)
@@ -49,14 +51,16 @@ Puppet::Type.type(:file).provide :posix do
     end
 
     if group.gid == ""
-      return nil
+      nil
     else
-      return group.name
+      group.name
     end
   end
 
   def name2gid(value)
-    Integer(value) rescue gid(value) || false
+    Integer(value)
+  rescue
+    gid(value) || false
   end
 
   def owner
@@ -71,7 +75,7 @@ Puppet::Type.type(:file).provide :posix do
     # large UIDs instead of negative ones.  This isn't a Ruby bug,
     # it's an OS X bug, since it shows up in perl, too.
     if currentvalue > Puppet[:maximum_uid].to_i
-      self.warning _("Apparently using negative UID (%{currentvalue}) on a platform that does not consistently handle them") % { currentvalue: currentvalue }
+      warning _("Apparently using negative UID (%{currentvalue}) on a platform that does not consistently handle them") % { currentvalue: currentvalue }
       currentvalue = :silly
     end
 
@@ -103,7 +107,7 @@ Puppet::Type.type(:file).provide :posix do
     # large GIDs instead of negative ones.  This isn't a Ruby bug,
     # it's an OS X bug, since it shows up in perl, too.
     if currentvalue > Puppet[:maximum_uid].to_i
-      self.warning _("Apparently using negative GID (%{currentvalue}) on a platform that does not consistently handle them") % { currentvalue: currentvalue }
+      warning _("Apparently using negative GID (%{currentvalue}) on a platform that does not consistently handle them") % { currentvalue: currentvalue }
       currentvalue = :silly
     end
 
@@ -128,19 +132,17 @@ Puppet::Type.type(:file).provide :posix do
   def mode
     stat = resource.stat
     if stat
-      return (stat.mode & 007777).to_s(8).rjust(4, '0')
+      (stat.mode & 0o07777).to_s(8).rjust(4, '0')
     else
-      return :absent
+      :absent
     end
   end
 
   def mode=(value)
-    begin
-      File.chmod(value.to_i(8), resource[:path])
-    rescue => detail
-      error = Puppet::Error.new(_("failed to set mode %{mode} on %{path}: %{message}") % { mode: mode, path: resource[:path], message: detail.message })
-      error.set_backtrace detail.backtrace
-      raise error
-    end
+    File.chmod(value.to_i(8), resource[:path])
+  rescue => detail
+    error = Puppet::Error.new(_("failed to set mode %{mode} on %{path}: %{message}") % { mode: mode, path: resource[:path], message: detail.message })
+    error.set_backtrace detail.backtrace
+    raise error
   end
 end

data/lib/puppet/provider/file/windows.rb

@@ -43,11 +43,9 @@ Puppet::Type.type(:file).provide :windows do
   end
 
   def owner=(should)
-    begin
-      set_owner(should, resolved_path)
-    rescue => detail
-      raise Puppet::Error, _("Failed to set owner to '%{should}': %{detail}") % { should: should, detail: detail }, detail.backtrace
-    end
+    set_owner(should, resolved_path)
+  rescue => detail
+    raise Puppet::Error, _("Failed to set owner to '%{should}': %{detail}") % { should: should, detail: detail }, detail.backtrace
   end
 
   def group
@@ -57,11 +55,9 @@ Puppet::Type.type(:file).provide :windows do
   end
 
   def group=(should)
-    begin
-      set_group(should, resolved_path)
-    rescue => detail
-      raise Puppet::Error, _("Failed to set group to '%{should}': %{detail}") % { should: should, detail: detail }, detail.backtrace
-    end
+    set_group(should, resolved_path)
+  rescue => detail
+    raise Puppet::Error, _("Failed to set group to '%{should}': %{detail}") % { should: should, detail: detail }, detail.backtrace
   end
 
   def mode
@@ -74,15 +70,13 @@ Puppet::Type.type(:file).provide :windows do
   end
 
   def mode=(value)
-    begin
-      managing_owner = !resource[:owner].nil?
-      managing_group = !resource[:group].nil?
-      set_mode(value.to_i(8), resource[:path], true, managing_owner, managing_group)
-    rescue => detail
-      error = Puppet::Error.new(_("failed to set mode %{mode} on %{path}: %{message}") % { mode: mode, path: resource[:path], message: detail.message })
-      error.set_backtrace detail.backtrace
-      raise error
-    end
+    managing_owner = !resource[:owner].nil?
+    managing_group = !resource[:group].nil?
+    set_mode(value.to_i(8), resource[:path], true, managing_owner, managing_group)
+  rescue => detail
+    error = Puppet::Error.new(_("failed to set mode %{mode} on %{path}: %{message}") % { mode: mode, path: resource[:path], message: detail.message })
+    error.set_backtrace detail.backtrace
+    raise error
   end
 
   def validate

data/lib/puppet/provider/group/directoryservice.rb

@@ -14,10 +14,11 @@ Puppet::Type.type(:group).provide :directoryservice, :parent => Puppet::Provider
 
   def members_insync?(current, should)
     return false unless current
+
     if current == :absent
-      return should.empty?
+      should.empty?
     else
-      return current.sort.uniq == should.sort.uniq
+      current.sort.uniq == should.sort.uniq
     end
   end
 end

data/lib/puppet/provider/group/groupadd.rb

@@ -11,7 +11,7 @@ Puppet::Type.type(:group).provide :groupadd, :parent => Puppet::Provider::NameSe
 
   commands :add => "groupadd", :delete => "groupdel", :modify => "groupmod"
 
-  has_feature :system_groups unless %w{HP-UX Solaris}.include? Puppet.runtime[:facter].value('os.name')
+  has_feature :system_groups unless %w[HP-UX Solaris].include? Puppet.runtime[:facter].value('os.name')
 
   verify :gid, _("GID must be an integer") do |value|
     value.is_a? Integer
@@ -47,11 +47,11 @@ Puppet::Type.type(:group).provide :groupadd, :parent => Puppet::Provider::NameSe
     # because by default duplicates are allowed.  This check is
     # to ensure consistent behaviour of the useradd provider when
     # using both useradd and luseradd
-    if not @resource.allowdupe? and @resource.forcelocal?
+    if !@resource.allowdupe? and @resource.forcelocal?
       if @resource.should(:gid) and findgroup(:gid, @resource.should(:gid).to_s)
         raise(Puppet::Error, _("GID %{resource} already exists, use allowdupe to force group creation") % { resource: @resource.should(:gid).to_s })
       end
-    elsif @resource.allowdupe? and not @resource.forcelocal?
+    elsif @resource.allowdupe? and !@resource.forcelocal?
       return ["-o"]
     end
     []
@@ -144,7 +144,7 @@ Puppet::Type.type(:group).provide :groupadd, :parent => Puppet::Provider::NameSe
 
     unless @groups
       unless Puppet::FileSystem.exist?(group_file)
-        raise Puppet::Error.new("Forcelocal set for group resource '#{resource[:name]}', but #{group_file} does not exist")
+        raise Puppet::Error, "Forcelocal set for group resource '#{resource[:name]}', but #{group_file} does not exist"
       end
 
       @groups = []

data/lib/puppet/provider/group/windows_adsi.rb

@@ -44,7 +44,7 @@ Puppet::Type.type(:group).provide :windows_adsi do
 
     users = users.map do |user_name|
       sid = Puppet::Util::Windows::SID.name_to_principal(user_name)
-      if !sid
+      unless sid
         resource.debug("#{user_name} (unresolvable to SID)")
         next user_name
       end
@@ -57,7 +57,7 @@ Puppet::Type.type(:group).provide :windows_adsi do
       resource.debug("#{sid.domain}\\#{account} (#{sid.sid})")
       sid.domain ? "#{sid.domain}\\#{account}" : account
     end
-    return users.join(',')
+    users.join(',')
   end
 
   def member_valid?(user_name)

data/lib/puppet/provider/nameservice/directoryservice.rb

@@ -79,7 +79,7 @@ class Puppet::Provider::NameService::DirectoryService < Puppet::Provider::NameSe
     # Create a new instance of this Puppet::Type for each object present
     #    on the system.
     list_all_present.collect do |name_string|
-      self.new(single_report(name_string, *type_property_array))
+      new(single_report(name_string, *type_property_array))
     end
   end
 
@@ -119,7 +119,7 @@ class Puppet::Provider::NameService::DirectoryService < Puppet::Provider::NameSe
     attribute_hash = {}
     input_hash.each_key do |key|
       ds_attribute = key.sub("dsAttrTypeStandard:", "")
-      next unless (ds_to_ns_attribute_map.keys.include?(ds_attribute) and type_properties.include? ds_to_ns_attribute_map[ds_attribute])
+      next unless ds_to_ns_attribute_map.keys.include?(ds_attribute) and type_properties.include? ds_to_ns_attribute_map[ds_attribute]
 
       ds_value = input_hash[key]
       case ds_to_ns_attribute_map[ds_attribute]
@@ -144,7 +144,7 @@ class Puppet::Provider::NameService::DirectoryService < Puppet::Provider::NameSe
     # stored in the user record. It is stored at a path that involves the
     # UUID of the user record for non-Mobile local accounts.
     # Mobile Accounts are out of scope for this provider for now
-    attribute_hash[:password] = self.get_password(attribute_hash[:guid], attribute_hash[:name]) if @resource_type.validproperties.include?(:password) and Puppet.features.root?
+    attribute_hash[:password] = get_password(attribute_hash[:guid], attribute_hash[:name]) if @resource_type.validproperties.include?(:password) and Puppet.features.root?
     attribute_hash
   end
 
@@ -168,9 +168,9 @@ class Puppet::Provider::NameService::DirectoryService < Puppet::Provider::NameSe
       fail(_("Could not get report.  command execution failed."))
     end
 
-    dscl_plist = self.parse_dscl_plist_data(dscl_output)
+    dscl_plist = parse_dscl_plist_data(dscl_output)
 
-    self.generate_attribute_hash(dscl_plist, *type_properties)
+    generate_attribute_hash(dscl_plist, *type_properties)
   end
 
   def self.get_exec_preamble(ds_action, resource_name = nil)
@@ -264,8 +264,8 @@ class Puppet::Provider::NameService::DirectoryService < Puppet::Provider::NameSe
         # string. The password_hash provided as a resource attribute is a
         # hex value. We need to convert the Base64 encoded string to a
         # hex value and provide it back to Puppet.
-        password_hash = converted_hash_plist['SALTED-SHA512'].unpack("H*")[0]
-        password_hash
+        converted_hash_plist['SALTED-SHA512'].unpack1("H*")
+
       end
     end
   end
@@ -325,7 +325,7 @@ class Puppet::Provider::NameService::DirectoryService < Puppet::Provider::NameSe
         else
           value = autogen(name)
           if value
-            self.send(name.to_s + "=", value)
+            send(name.to_s + "=", value)
           else
             next
           end
@@ -361,7 +361,7 @@ class Puppet::Provider::NameService::DirectoryService < Puppet::Provider::NameSe
       # If we are meant to be authoritative for the group membership
       # then remove all existing members who haven't been specified
       # in the manifest.
-      remove_unwanted_members(current_members, value) if @resource[:auth_membership] and not current_members.nil?
+      remove_unwanted_members(current_members, value) if @resource[:auth_membership] and !current_members.nil?
 
       # if they're not a member, make them one.
       add_members(current_members, value)
@@ -395,7 +395,7 @@ class Puppet::Provider::NameService::DirectoryService < Puppet::Provider::NameSe
     # requiring people install a UUID library that doesn't come with the system.
     # This should be revisited if Puppet starts managing UUIDs for other platform
     # user records.
-    guid = %x{/usr/bin/uuidgen}.chomp
+    guid = %x(/usr/bin/uuidgen).chomp
 
     exec_arg_vector = self.class.get_exec_preamble("-create", @resource[:name])
     exec_arg_vector << ns_to_ds_attribute_map[:guid] << guid
@@ -421,7 +421,7 @@ class Puppet::Provider::NameService::DirectoryService < Puppet::Provider::NameSe
       if property == :uid and value.nil?
         value = self.class.next_system_id('uid')
       end
-      if value != "" and not value.nil?
+      if value != "" and !value.nil?
         if property == :members
           add_members(nil, value)
         else
@@ -442,19 +442,19 @@ class Puppet::Provider::NameService::DirectoryService < Puppet::Provider::NameSe
 
   def remove_unwanted_members(current_members, new_members)
     current_members.each do |member|
-      if not new_members.flatten.include?(member)
-        cmd = [:dseditgroup, "-o", "edit", "-n", ".", "-d", member, @resource[:name]]
+      next if new_members.flatten.include?(member)
+
+      cmd = [:dseditgroup, "-o", "edit", "-n", ".", "-d", member, @resource[:name]]
+      begin
+        execute(cmd)
+      rescue Puppet::ExecutionFailure
+        # TODO: We're falling back to removing the member using dscl due to rdar://8481241
+        # This bug causes dseditgroup to fail to remove a member if that member doesn't exist
+        cmd = [:dscl, ".", "-delete", "/Groups/#{@resource.name}", "GroupMembership", member]
         begin
           execute(cmd)
-        rescue Puppet::ExecutionFailure
-          # TODO: We're falling back to removing the member using dscl due to rdar://8481241
-          # This bug causes dseditgroup to fail to remove a member if that member doesn't exist
-          cmd = [:dscl, ".", "-delete", "/Groups/#{@resource.name}", "GroupMembership", member]
-          begin
-            execute(cmd)
-          rescue Puppet::ExecutionFailure => detail
-            fail(_("Could not remove %{member} from group: %{resource}, %{detail}") % { member: member, resource: @resource.name, detail: detail })
-          end
+        rescue Puppet::ExecutionFailure => detail
+          fail(_("Could not remove %{member} from group: %{resource}, %{detail}") % { member: member, resource: @resource.name, detail: detail })
         end
       end
     end
@@ -462,13 +462,13 @@ class Puppet::Provider::NameService::DirectoryService < Puppet::Provider::NameSe
 
   def add_members(current_members, new_members)
     new_members.flatten.each do |new_member|
-      if current_members.nil? or not current_members.include?(new_member)
-        cmd = [:dseditgroup, "-o", "edit", "-n", ".", "-a", new_member, @resource[:name]]
-        begin
-          execute(cmd)
-        rescue Puppet::ExecutionFailure => detail
-          fail(_("Could not add %{new_member} to group: %{name}, %{detail}") % { new_member: new_member, name: @resource.name, detail: detail })
-        end
+      next unless current_members.nil? or !current_members.include?(new_member)
+
+      cmd = [:dseditgroup, "-o", "edit", "-n", ".", "-a", new_member, @resource[:name]]
+      begin
+        execute(cmd)
+      rescue Puppet::ExecutionFailure => detail
+        fail(_("Could not add %{new_member} to group: %{name}, %{detail}") % { new_member: new_member, name: @resource.name, detail: detail })
       end
     end
   end

data/lib/puppet/provider/nameservice/objectadd.rb

@@ -15,10 +15,8 @@ class Puppet::Provider::NameService
     end
 
     def posixmethod(name)
-      name   = name.intern if name.is_a? String
-      method = self.class.option(name, :method) || name
-
-      method
+      name = name.intern if name.is_a? String
+      self.class.option(name, :method) || name
     end
   end
 end

data/lib/puppet/provider/nameservice/pw.rb

@@ -9,14 +9,13 @@ class Puppet::Provider::NameService
     end
 
     def modifycmd(param, value)
-      cmd = [
+      [
         command(:pw),
         "#{@resource.class.name}mod",
         @resource[:name],
         flag(param),
         munge(param, value)
       ]
-      cmd
     end
   end
 end

data/lib/puppet/provider/nameservice.rb

@@ -98,7 +98,7 @@ class Puppet::Provider::NameService < Puppet::Provider
     private
 
     def op(property)
-      @ops[property.name] || ("-#{property.name}")
+      @ops[property.name] || "-#{property.name}"
     end
   end
 
@@ -108,15 +108,15 @@ class Puppet::Provider::NameService < Puppet::Provider
     field = field.intern
     id_generators = { :user => :uid, :group => :gid }
     if id_generators[@resource.class.name] == field
-      return self.class.autogen_id(field, @resource.class.name)
+      self.class.autogen_id(field, @resource.class.name)
     else
       value = self.class.autogen_default(field)
       if value
-        return value
+        value
       elsif respond_to?("autogen_#{field}")
-        return send("autogen_#{field}")
+        send("autogen_#{field}")
       else
-        return nil
+        nil
       end
     end
   end
@@ -142,7 +142,7 @@ class Puppet::Provider::NameService < Puppet::Provider
       # loop.  Thanks, Ruby, for your awesome abstractions. --daniel 2012-03-23
       highest = []
       Puppet::Etc.send(database) { |entry| highest << entry.send(method) }
-      highest = highest.reject { |x| x > 65000 }.max
+      highest = highest.reject { |x| x > 65_000 }.max
 
       @prevauto = highest || 1000
     end
@@ -160,7 +160,7 @@ class Puppet::Provider::NameService < Puppet::Provider
 
     begin
       sensitive = has_sensitive_data?
-      execute(self.addcmd, { :failonfail => true, :combine => true, :custom_environment => @custom_environment, :sensitive => sensitive })
+      execute(addcmd, { :failonfail => true, :combine => true, :custom_environment => @custom_environment, :sensitive => sensitive })
       if feature?(:manages_password_age) && (cmd = passcmd)
         execute(cmd, { :failonfail => true, :combine => true, :custom_environment => @custom_environment, :sensitive => sensitive })
       end
@@ -177,7 +177,7 @@ class Puppet::Provider::NameService < Puppet::Provider
     end
 
     begin
-      execute(self.deletecmd, { :failonfail => true, :combine => true, :custom_environment => @custom_environment })
+      execute(deletecmd, { :failonfail => true, :combine => true, :custom_environment => @custom_environment })
     rescue Puppet::ExecutionFailure => detail
       raise Puppet::Error, _("Could not delete %{resource} %{name}: %{detail}") % { resource: @resource.class.name, name: @resource.name, detail: detail }, detail.backtrace
     end