puppet 3.2.4 → 3.3.0.rc2

data/lib/puppet/pops/validation/checker3_1.rb

@@ -281,7 +281,7 @@ class Puppet::Pops::Validation::Checker3_1
   end
 
   def check_QueryExpression(o)
-    rvalue(o.expr) if o.expr  # is optional
+    query(o.expr) if o.expr  # is optional
   end
 
   def relation_Object(o, rel_expr)

data/lib/puppet/pops/validation/validator_factory_3_1.rb

@@ -1,20 +1,8 @@
 # Configures validation suitable for 3.1 + iteration
 #
-class Puppet::Pops::Validation::ValidatorFactory_3_1
+class Puppet::Pops::Validation::ValidatorFactory_3_1 < Puppet::Pops::Validation::Factory
   Issues = Puppet::Pops::Issues
 
-  # Produces a validator with the given acceptor as the recipient of produced diagnostics.
-  #
-  def validator acceptor
-    checker(diagnostic_producer(acceptor))
-  end
-
-  # Produces the diagnostics producer to use given an acceptor as the recipient of produced diagnostics
-  #
-  def diagnostic_producer acceptor
-    Puppet::Pops::Validation::DiagnosticProducer.new(acceptor, severity_producer(), label_provider())
-  end
-
   # Produces the checker to use
   def checker diagnostic_producer
     Puppet::Pops::Validation::Checker3_1.new(diagnostic_producer)
@@ -27,12 +15,14 @@ class Puppet::Pops::Validation::ValidatorFactory_3_1
 
   # Produces the severity producer to use
   def severity_producer
-    p = Puppet::Pops::Validation::SeverityProducer.new
+    p = super
 
     # Configure each issue that should **not** be an error
     #
-    p[Issues::RT_NO_STORECONFIGS_EXPORT]    = :warning
-    p[Issues::RT_NO_STORECONFIGS]           = :warning
+    # Validate as per the current runtime configuration
+    p[Issues::RT_NO_STORECONFIGS_EXPORT]    = Puppet[:storeconfigs] ? :ignore : :warning
+    p[Issues::RT_NO_STORECONFIGS]           = Puppet[:storeconfigs] ? :ignore : :warning
+
     p[Issues::NAME_WITH_HYPHEN]             = :deprecation
     p[Issues::DEPRECATED_NAME_AS_TYPE]      = :deprecation
 

data/lib/puppet/property.rb

@@ -194,7 +194,7 @@ class Puppet::Property < Puppet::Parameter
   def call_valuemethod(name, value)
     if method = self.class.value_option(name, :method) and self.respond_to?(method)
       begin
-        event = self.send(method)
+        self.send(method)
       rescue Puppet::Error
         raise
       rescue => detail
@@ -611,7 +611,7 @@ class Puppet::Property < Puppet::Parameter
   end
 
   # (see #should=)
-  def value=(value)
-    self.should = value
+  def value=(values)
+    self.should = values
   end
 end

data/lib/puppet/property/keyvalue.rb

@@ -70,7 +70,7 @@ module Puppet
         ";"
       end
 
-      # Retrieves the key-hash from the provider by invoking it's method named the same as this property.
+      # Retrieves the key-hash from the provider by invoking its method named the same as this property.
       # @return [Hash] the hash from the provider, or `:absent`
       #
       def retrieve

data/lib/puppet/provider.rb

@@ -185,7 +185,7 @@ class Puppet::Provider
   # is lazy (when a resource is evaluated) and the absence of commands
   # that will be present after other resources have been applied no longer needs to be specified as
   # optional.
-  # @param [Hash{String => String}] command_specs Named commands that the provider will
+  # @param [Hash{String => String}] hash Named commands that the provider will
   #   be executing on the system. Each command is specified with a name and the path of the executable.
   # (@see #has_command)
   # @see commands
@@ -564,7 +564,7 @@ class Puppet::Provider
 
   # Sets the given parameters values as the current values for those parameters.
   # Other parameters are unchanged.
-  # @param [Array<Puppet::Parameter] the parameters with values that should be set
+  # @param [Array<Puppet::Parameter>] params the parameters with values that should be set
   # @return [void]
   #
   def set(params)

data/lib/puppet/provider/aixobject.rb

@@ -7,24 +7,20 @@ class Puppet::Provider::AixObject < Puppet::Provider
   desc "Generic AIX resource provider"
 
   # The real provider must implement these functions.
-  def lscmd(value=@resource[:name])
-    raise Puppet::Error, "Method not defined #{@resource.class.name} #{@resource.name}: #{detail}"
+  def lscmd( _value = @resource[:name] )
+    raise Puppet::Error, "Method not defined #{@resource.class.name} #{@resource.name}: Base AixObject provider doesn't implement lscmd"
   end
 
-  def lscmd(value=@resource[:name])
-    raise Puppet::Error, "Method not defined #{@resource.class.name} #{@resource.name}: #{detail}"
+  def addcmd( _extra_attrs = [] )
+    raise Puppet::Error, "Method not defined #{@resource.class.name} #{@resource.name}: Base AixObject provider doesn't implement addcmd"
   end
 
-  def addcmd(extra_attrs = [])
-    raise Puppet::Error, "Method not defined #{@resource.class.name} #{@resource.name}: #{detail}"
-  end
-
-  def modifycmd(attributes_hash)
-    raise Puppet::Error, "Method not defined #{@resource.class.name} #{@resource.name}: #{detail}"
+  def modifycmd( _attributes_hash = {} )
+    raise Puppet::Error, "Method not defined #{@resource.class.name} #{@resource.name}: Base AixObject provider doesn't implement modifycmd"
   end
 
   def deletecmd
-    raise Puppet::Error, "Method not defined #{@resource.class.name} #{@resource.name}: #{detail}"
+    raise Puppet::Error, "Method not defined #{@resource.class.name} #{@resource.name}: Base AixObject provider doesn't implement deletecmd"
   end
 
   # Valid attributes to be managed by this provider.
@@ -152,7 +148,7 @@ class Puppet::Provider::AixObject < Puppet::Provider
   # Parse AIX command attributes from the output of an AIX command, that
   # which format is a list of space separated of key=value pairs:
   # "uid=100 groups=a,b,c".
-  # It returns an hash.
+  # It returns a hash.
   #
   # If a mapping is provided, the keys are translated as defined in the
   # mapping hash. And only values included in mapping will be added
@@ -161,7 +157,7 @@ class Puppet::Provider::AixObject < Puppet::Provider
   def parse_attr_list(str, mapping=self.class.attribute_mapping_from)
     properties = {}
     attrs = []
-    if !str or (attrs = str.split()).empty?
+    if str.nil? or (attrs = str.split()).empty?
       return nil
     end
 
@@ -169,11 +165,13 @@ class Puppet::Provider::AixObject < Puppet::Provider
       if i.include? "=" # Ignore if it does not include '='
         (key_str, val) = i.split('=')
         # Check the key
-        if !key_str or key_str.empty?
+        if key_str.nil? or key_str.empty?
           info "Empty key in string 'i'?"
           continue
         end
+        key_str.strip!
         key = key_str.to_sym
+        val.strip! if val
 
         properties = self.load_attribute(key, val, mapping, properties)
       end
@@ -193,7 +191,7 @@ class Puppet::Provider::AixObject < Puppet::Provider
   def parse_colon_list(str, key_list, mapping=self.class.attribute_mapping_from)
     properties = {}
     attrs = []
-    if !str or (attrs = str.split(':')).empty?
+    if str.nil? or (attrs = str.split(':')).empty?
       return nil
     end
 
@@ -227,9 +225,9 @@ class Puppet::Provider::AixObject < Puppet::Provider
       # Execute lsuser, split all attributes and add them to a dict.
       begin
         output = execute(self.lscmd)
-        @objectinfo = self.parse_command_output(execute(self.lscmd))
+        @objectinfo = self.parse_command_output(output)
         # All attributtes without translation
-        @objectosinfo = self.parse_command_output(execute(self.lscmd), nil)
+        @objectosinfo = self.parse_command_output(output, nil)
       rescue Puppet::ExecutionFailure => detail
         # Print error if needed. FIXME: Do not check the user here.
         Puppet.debug "aix.getinfo(): Could not find #{@resource.class.name} #{@resource.name}: #{detail}"
@@ -241,10 +239,10 @@ class Puppet::Provider::AixObject < Puppet::Provider
   # Like getinfo, but it will not use the mapping to translate the keys and values.
   # It might be usefult to retrieve some raw information.
   def getosinfo(refresh = false)
-    if @objectosinfo .nil? or refresh == true
+    if @objectosinfo.nil? or refresh == true
       getinfo(refresh)
     end
-    @objectosinfo
+    @objectosinfo || Hash.new
   end
 
 
@@ -290,7 +288,7 @@ class Puppet::Provider::AixObject < Puppet::Provider
   # providers, preferably with values already filled in, not resources.
   def self.instances
     objects=[]
-    self.list_all.each { |entry|
+    list_all.each { |entry|
       objects << new(:name => entry, :ensure => :present)
     }
     objects
@@ -383,7 +381,7 @@ class Puppet::Provider::AixObject < Puppet::Provider
     end
 
     # Refresh de info.
-    hash = getinfo(true)
+    getinfo(true)
   end
 
   def initialize(resource)

data/lib/puppet/provider/augeas/augeas.rb

@@ -327,6 +327,8 @@ Puppet::Type.type(:augeas).provide(:augeas) do
 
   def print_errors(errors)
     errors.each do |errnode|
+      error = @aug.get(errnode)
+      debug("#{errnode} = #{error}") unless error.nil?
       @aug.match("#{errnode}/*").each do |subnode|
         subvalue = @aug.get(subnode)
         debug("#{subnode} = #{subvalue}")
@@ -334,7 +336,7 @@ Puppet::Type.type(:augeas).provide(:augeas) do
     end
   end
 
-  # Determines if augeas acutally needs to run.
+  # Determines if augeas actually needs to run.
   def need_to_run?
     force = resource[:force]
     return_value = true

data/lib/puppet/provider/command.rb

@@ -16,8 +16,8 @@ class Puppet::Provider::Command
     @options = options
   end
 
-  # @param [Array<String>] Any command line arguments to pass to the executable
-  # @returns The output from the command
+  # @param args [Array<String>] Any command line arguments to pass to the executable
+  # @return The output from the command
   def execute(*args)
     resolved_executable = @resolver.which(@executable) or raise Puppet::Error, "Command #{@name} is missing"
     @executor.execute([resolved_executable] + args, @options)

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

@@ -116,7 +116,7 @@ Puppet::Type.type(:group).provide :aix, :parent => Puppet::Provider::AixObject d
   end
 
   def attributes
-    filter_attributes(getosinfo(refresh = false))
+    filter_attributes(getosinfo(false))
   end
 
   def attributes=(attr_hash)

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

@@ -40,6 +40,6 @@ Puppet::Type.type(:group).provide :ldap, :parent => Puppet::Provider::Ldap do
 
     # Only use the first result.
     group = result[0]
-    gid = group[:gid][0]
+    group[:gid][0]
   end
 end

data/lib/puppet/provider/macauthorization/macauthorization.rb

@@ -186,7 +186,7 @@ Puppet::Type.type(:macauthorization).provide :macauthorization, :parent => Puppe
       Plist::Emit.save_plist(values, tmp.path)
       cmds = []
       cmds << :security << "authorizationdb" << "write" << name
-      output = execute(cmds, :failonfail => false, :combine => false, :stdinfile => tmp.path.to_s)
+      execute(cmds, :failonfail => false, :combine => false, :stdinfile => tmp.path.to_s)
     rescue Errno::EACCES => e
       raise Puppet::Error.new("Cannot save right to #{tmp.path}: #{e}")
     ensure

data/lib/puppet/provider/mailalias/aliases.rb

@@ -1,11 +1,9 @@
 require 'puppet/provider/parsedfile'
 
-
-  Puppet::Type.type(:mailalias).provide(
-    :aliases,
+Puppet::Type.type(:mailalias).provide(
+  :aliases,
   :parent => Puppet::Provider::ParsedFile,
   :default_target => "/etc/aliases",
-
   :filetype => :flat
 ) do
   text_line :comment, :match => /^#/
@@ -13,10 +11,7 @@ require 'puppet/provider/parsedfile'
 
   record_line :aliases, :fields => %w{name recipient}, :separator => /\s*:\s*/, :block_eval => :instance do
     def post_parse(record)
-      # LAK:NOTE See http://snurl.com/21zf8  [groups_google_com]
-      # It's not sufficient to assign to an existing hash.
-      recipient = record[:recipient].split(/\s*,\s*/).collect { |d| d.gsub(/^['"]|['"]$/, '') }
-      record[:recipient] = recipient
+      record[:recipient] = record[:recipient].split(/\s*,\s*/).collect { |d| d.gsub(/^['"]|['"]$/, '') }
       record
     end
 

data/lib/puppet/provider/mcx/mcxcontent.rb

@@ -83,7 +83,7 @@ Puppet::Type.type(:mcx).provide :mcxcontent, :parent => Puppet::Provider do
   def exists?
     begin
       has_mcx?
-    rescue Puppet::ExecutionFailure => e
+    rescue Puppet::ExecutionFailure
       return false
     end
   end
@@ -111,10 +111,16 @@ Puppet::Type.type(:mcx).provide :mcxcontent, :parent => Puppet::Provider do
     ds_t = TypeMap[ds_type]
     ds_path = "/Local/Default/#{ds_t}/#{ds_name}"
 
+    if has_mcx?
+      Puppet.debug "Removing MCX from #{ds_path}"
+      dscl 'localhost', '-mcxdelete', ds_path
+    end
+
     tmp = Tempfile.new('puppet_mcx')
     begin
       tmp << val
       tmp.flush
+      Puppet.debug "Importing MCX into #{ds_path}"
       dscl 'localhost', '-mcximport', ds_path, tmp.path
     ensure
       tmp.close

data/lib/puppet/provider/mount.rb

@@ -5,10 +5,15 @@ require 'puppet'
 module Puppet::Provider::Mount
   # This only works when the mount point is synced to the fstab.
   def mount
-    # Manually pass the mount options in, since some OSes *cough*OS X*cough* don't
-    # read from /etc/fstab but still want to use this type.
     args = []
-    args << "-o" << self.options if self.options and self.options != :absent
+
+    # In general we do not have to pass mountoptions because we always
+    # flush /etc/fstab before attempting to mount. But old code suggests
+    # that MacOS always needs the mount options to be explicitly passed to
+    # the mount command
+    if Facter.value(:kernel) == 'Darwin'
+      args << "-o" << self.options if self.options and self.options != :absent
+    end
     args << resource[:name]
 
     mountcmd(*args)

data/lib/puppet/provider/nameservice.rb

@@ -227,7 +227,7 @@ class Puppet::Provider::NameService < Puppet::Provider
       @etcmethod ||= ("get" + self.class.section.to_s + "nam").intern
       begin
         @objectinfo = Etc.send(@etcmethod, @resource[:name])
-      rescue ArgumentError => detail
+      rescue ArgumentError
         @objectinfo = nil
       end
     end

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

@@ -108,7 +108,7 @@ class Puppet::Provider::NameService::DirectoryService < Puppet::Provider::NameSe
     # JJM: List all objects of this Puppet::Type already present on the system.
     begin
       dscl_output = execute(get_exec_preamble("-list"))
-    rescue Puppet::ExecutionFailure => detail
+    rescue Puppet::ExecutionFailure
       fail("Could not get #{@resource_type.name} list from DirectoryService")
     end
     dscl_output.split("\n")
@@ -166,7 +166,7 @@ class Puppet::Provider::NameService::DirectoryService < Puppet::Provider::NameSe
     dscl_vector = get_exec_preamble("-read", resource_name)
     begin
       dscl_output = execute(dscl_vector)
-    rescue Puppet::ExecutionFailure => detail
+    rescue Puppet::ExecutionFailure
       fail("Could not get report.  command execution failed.")
     end
 
@@ -237,7 +237,7 @@ class Puppet::Provider::NameService::DirectoryService < Puppet::Provider::NameSe
       dscl_vector = self.get_exec_preamble("-merge", resource_name)
       dscl_vector << "AuthenticationAuthority" << ";ShadowHash;"
       begin
-        dscl_output = execute(dscl_vector)
+        execute(dscl_vector)
       rescue Puppet::ExecutionFailure => detail
         fail("Could not set AuthenticationAuthority.")
       end
@@ -332,7 +332,7 @@ class Puppet::Provider::NameService::DirectoryService < Puppet::Provider::NameSe
   def self.convert_xml_to_binary(plist_data)
     Puppet.debug('Converting XML plist to binary')
     Puppet.debug('Executing: \'plutil -convert binary1 -o - -\'')
-    IO.popen('plutil -convert binary1 -o - -', mode='r+') do |io|
+    IO.popen('plutil -convert binary1 -o - -', 'r+') do |io|
       io.write plist_data.to_plist
       io.close_write
       @converted_plist = io.read
@@ -345,7 +345,7 @@ class Puppet::Provider::NameService::DirectoryService < Puppet::Provider::NameSe
   def self.convert_binary_to_xml(plist_data)
     Puppet.debug('Converting binary plist to XML')
     Puppet.debug('Executing: \'plutil -convert xml1 -o - -\'')
-    IO.popen('plutil -convert xml1 -o - -', mode='r+') do |io|
+    IO.popen('plutil -convert xml1 -o - -', 'r+') do |io|
       io.write plist_data
       io.close_write
       @converted_plist = io.read

data/lib/puppet/provider/package/appdmg.rb

@@ -88,7 +88,7 @@ Puppet::Type.type(:package).provide(:appdmg, :parent => Puppet::Provider::Packag
           end
       end
     ensure
-      FileUtils.remove_entry_secure(tmpdir, force=true)
+      FileUtils.remove_entry_secure(tmpdir, true)
     end
   end
 

data/lib/puppet/provider/package/apt.rb

@@ -45,7 +45,6 @@ Puppet::Type.type(:package).provide :apt, :parent => :dpkg, :source => :dpkg do
     checkforcdrom
     cmd = %w{-q -y}
 
-    keep = ""
     if config = @resource[:configfiles]
       if config == :keep
         cmd << "-o" << 'DPkg::Options::=--force-confold'

data/lib/puppet/provider/package/dpkg.rb

@@ -11,39 +11,75 @@ Puppet::Type.type(:package).provide :dpkg, :parent => Puppet::Provider::Package
   commands :dpkg_deb => "/usr/bin/dpkg-deb"
   commands :dpkgquery => "/usr/bin/dpkg-query"
 
+  # Performs a dpkgquery call with a pipe so that output can be processed
+  # inline in a passed block.
+  # @param args [Array<String>] any command line arguments to be appended to the command
+  # @param block expected to be passed on to execpipe
+  # @return whatever the block returns
+  # @see Puppet::Util::Execution.execpipe
+  # @api private
+  def self.dpkgquery_piped(*args, &block)
+    cmd = args.unshift(command(:dpkgquery))
+    Puppet::Util::Execution.execpipe(cmd, &block)
+  end
+
   def self.instances
     packages = []
 
     # list out all of the packages
-    cmd = "#{command(:dpkgquery)} -W --showformat '${Status} ${Package} ${Version}\\n'"
-    Puppet.debug "Executing '#{cmd}'"
-    Puppet::Util::Execution.execpipe(cmd) do |process|
-      # our regex for matching dpkg output
-      regex = %r{^(\S+) +(\S+) +(\S+) (\S+) (\S*)$}
-      fields = [:desired, :error, :status, :name, :ensure]
-      hash = {}
-
-      # now turn each returned line into a package object
-      process.each_line { |line|
-        if hash = parse_line(line)
-          packages << new(hash)
-        end
-      }
+    dpkgquery_piped('-W', '--showformat', self::DPKG_QUERY_FORMAT_STRING) do |pipe|
+      until pipe.eof?
+        hash = parse_multi_line(pipe)
+        packages << new(hash) if hash
+      end
     end
 
     packages
   end
 
-  self::REGEX = %r{^(\S+) +(\S+) +(\S+) (\S+) (\S*)$}
-  self::FIELDS = [:desired, :error, :status, :name, :ensure]
+  private
+
+  # Note: self:: is required here to keep these constants in the context of what will
+  # eventually become this Puppet:Type::Package::ProviderDpkg class.
+  self::DPKG_DESCRIPTION_DELIMITER = ':DESC:'
+  self::DPKG_QUERY_FORMAT_STRING = %Q{'${Status} ${Package} ${Version} #{self::DPKG_DESCRIPTION_DELIMITER} ${Description}\\n#{self::DPKG_DESCRIPTION_DELIMITER}\\n'}
+  self::FIELDS_REGEX = %r{^(\S+) +(\S+) +(\S+) (\S+) (\S*) #{self::DPKG_DESCRIPTION_DELIMITER} (.*)$}
+  self::FIELDS= [:desired, :error, :status, :name, :ensure, :description]
+  self::END_REGEX = %r{^#{self::DPKG_DESCRIPTION_DELIMITER}$}
+
+  # Handles parsing one package's worth of multi-line dpkg-query output.  Will
+  # emit warnings if it encounters an initial line that does not match
+  # DPKG_QUERY_FORMAT_STRING.  Swallows extra description lines silently.
+  #
+  # @param pipe [IO] the pipe yielded while processing dpkg output
+  # @return [Hash,nil] parsed dpkg-query entry as a hash of FIELDS strings or
+  # nil if we failed to parse
+  # @api private
+  def self.parse_multi_line(pipe)
+
+    line = pipe.gets
+    unless hash = parse_line(line)
+      Puppet.warning "Failed to match dpkg-query line #{line.inspect}"
+      return nil
+    end
+
+    consume_excess_description(pipe)
+
+    return hash
+  end
 
+  # @param line [String] one line of dpkg-query output
+  # @return [Hash,nil] a hash of FIELDS or nil if we failed to match
+  # @api private
   def self.parse_line(line)
-    if match = self::REGEX.match(line)
+    hash = nil
+
+    if match = self::FIELDS_REGEX.match(line)
       hash = {}
 
-      self::FIELDS.zip(match.captures) { |field,value|
+      self::FIELDS.zip(match.captures) do |field,value|
         hash[field] = value
-      }
+      end
 
       hash[:provider] = self.name
 
@@ -53,14 +89,33 @@ Puppet::Type.type(:package).provide :dpkg, :parent => Puppet::Provider::Package
         hash[:ensure] = :absent
       end
       hash[:ensure] = :held if hash[:desired] == 'hold'
-    else
-      Puppet.warning "Failed to match dpkg-query line #{line.inspect}"
-      return nil
     end
 
-    hash
+    return hash
   end
 
+  # Silently consumes the extra description lines from dpkg-query and brings
+  # us to the next package entry start.
+  #
+  # @note dpkg-query Description field has a one line summary and a multi-line
+  # description.  dpkg-query binary:Summary is what we want to use but was
+  # introduced in 2012 dpkg 1.16.2
+  # (https://launchpad.net/debian/+source/dpkg/1.16.2) and is not not available
+  # in older Debian versions.  So we're placing a delimiter marker at the end
+  # of the description so we can consume and ignore the multiline description
+  # without issuing warnings
+  #
+  # @param pipe [IO] the pipe yielded while processing dpkg output
+  # @return nil
+  def self.consume_excess_description(pipe)
+    until pipe.eof?
+      break if self::END_REGEX.match(pipe.gets)
+    end
+    return nil
+  end
+
+  public
+
   def install
     unless file = @resource[:source]
       raise ArgumentError, "You cannot install dpkg packages without a source"
@@ -94,26 +149,24 @@ Puppet::Type.type(:package).provide :dpkg, :parent => Puppet::Provider::Package
   end
 
   def query
-    packages = []
-
-    fields = [:desired, :error, :status, :name, :ensure]
-
-    hash = {}
+    hash = nil
 
     # list out our specific package
     begin
-      output = dpkgquery(
+      self.class.dpkgquery_piped(
         "-W",
         "--showformat",
-        '${Status} ${Package} ${Version}\\n',
+        self.class::DPKG_QUERY_FORMAT_STRING,
         @resource[:name]
-      )
+      ) do |pipe|
+        hash = self.class.parse_multi_line(pipe)
+      end
     rescue Puppet::ExecutionFailure
       # dpkg-query exits 1 if the package is not found.
       return {:ensure => :purged, :status => 'missing', :name => @resource[:name], :error => 'ok'}
     end
 
-    hash = self.class.parse_line(output) || {:ensure => :absent, :status => 'missing', :name => @resource[:name], :error => 'ok'}
+    hash ||= {:ensure => :absent, :status => 'missing', :name => @resource[:name], :error => 'ok'}
 
     if hash[:error] != "ok"
       raise Puppet::Error.new(
@@ -148,4 +201,5 @@ Puppet::Type.type(:package).provide :dpkg, :parent => Puppet::Provider::Package
       execute([:dpkg, "--set-selections"], :failonfail => false, :combine => false, :stdinfile => tmpfile.path.to_s)
     end
   end
+
 end