puppet 6.6.0 → 6.7.0

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

@@ -313,10 +313,13 @@ class Puppet::Provider::NameService::DirectoryService < Puppet::Provider::NameSe
         # have a string and need to convert it to a number
         if @resource.should(name)
           @resource.property(name).sync
-        elsif value = autogen(name)
-          self.send(name.to_s + "=", value)
         else
-          next
+          value = autogen(name)
+          if value
+            self.send(name.to_s + "=", value)
+          else
+            next
+          end
         end
       end
     end
@@ -393,7 +396,8 @@ class Puppet::Provider::NameService::DirectoryService < Puppet::Provider::NameSe
       fail(_("Could not set GeneratedUID for %{resource} %{name}: %{detail}") % { resource: @resource.class.name, name: @resource.name, detail: detail })
     end
 
-    if value = @resource.should(:password) and value != ""
+    value = @resource.should(:password)
+    if value && value != ""
       self.class.set_password(@resource[:name], guid, value)
     end
 

data/lib/puppet/provider/network_device.rb

@@ -13,7 +13,8 @@ class Puppet::Provider::NetworkDevice < Puppet::Provider
   def self.prefetch(resources)
     resources.each do |name, resource|
       device = Puppet::Util::NetworkDevice.current || device(resource[:device_url])
-      if result = lookup(device, name)
+      result = lookup(device, name)
+      if result
         result[:ensure] = :present
         resource.provider = new(device, result)
       else
@@ -45,7 +46,8 @@ class Puppet::Provider::NetworkDevice < Puppet::Provider
   def create
     @property_hash[:ensure] = :present
     self.class.resource_type.validproperties.each do |property|
-      if val = resource.should(property)
+      val = resource.should(property)
+      if val
         @property_hash[property] = val
       end
     end

data/lib/puppet/provider/package.rb

@@ -4,7 +4,8 @@ class Puppet::Provider::Package < Puppet::Provider
   # Prefetch our package list, yo.
   def self.prefetch(packages)
     instances.each do |prov|
-      if pkg = packages[prov.name]
+      pkg = packages[prov.name]
+      if pkg
         pkg.provider = prov
       end
     end

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

@@ -81,7 +81,8 @@ Puppet::Type.type(:package).provide :aix, :parent => Puppet::Provider::Package d
   end
 
   def install(useversion = true)
-    unless source = @resource[:source]
+    source = @resource[:source]
+    unless source
       self.fail _("A directory is required which will be used to find packages")
     end
 
@@ -101,7 +102,8 @@ Puppet::Type.type(:package).provide :aix, :parent => Puppet::Provider::Package d
   def self.pkglist(hash = {})
     cmd = [command(:lslpp), "-qLc"]
 
-    if name = hash[:pkgname]
+    name = hash[:pkgname]
+    if name
       cmd << name
     end
 

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

@@ -98,10 +98,12 @@ Puppet::Type.type(:package).provide(:appdmg, :parent => Puppet::Provider::Packag
   end
 
   def install
-    unless source = @resource[:source]
+    source = @resource[:source]
+    unless source
       self.fail _("Mac OS X PKG DMGs must specify a package source.")
     end
-    unless name = @resource[:name]
+    name = @resource[:name]
+    unless name
       self.fail _("Mac OS X PKG DMGs must specify a package name.")
     end
     self.class.installpkgdmg(source,name)

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

@@ -37,7 +37,8 @@ Puppet::Type.type(:package).provide :apple, :parent => Puppet::Provider::Package
   end
 
   def install
-    unless source = @resource[:source]
+    source = @resource[:source]
+    unless source
       self.fail _("Mac OS X packages must specify a package source")
     end
 

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

@@ -49,7 +49,8 @@ Puppet::Type.type(:package).provide :apt, :parent => :dpkg, :source => :dpkg do
     checkforcdrom
     cmd = %w{-q -y}
 
-    if config = @resource[:configfiles]
+    config = @resource[:configfiles]
+    if config
       if config == :keep
         cmd << "-o" << 'DPkg::Options::=--force-confold'
       else
@@ -89,7 +90,8 @@ Puppet::Type.type(:package).provide :apt, :parent => :dpkg, :source => :dpkg do
   # preseeds answers to dpkg-set-selection from the "responsefile"
   #
   def run_preseed
-    if response = @resource[:responsefile] and Puppet::FileSystem.exist?(response)
+    response = @resource[:responsefile]
+    if response && Puppet::FileSystem.exist?(response)
       self.info(_("Preseeding %{response} to debconf-set-selections") % { response: response })
 
       preseed response

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

@@ -93,7 +93,8 @@ Puppet::Type.type(:package).provide :blastwave, :parent => :sun, :source => :sun
   end
 
   def query
-    if hash = self.class.blastlist(:justme => @resource[:name])
+    hash = self.class.blastlist(:justme => @resource[:name])
+    if hash
       hash
     else
       {:ensure => :absent}

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

@@ -30,7 +30,8 @@ Puppet::Type.type(:package).provide :dpkg, :parent => Puppet::Provider::Package
     dpkgquery_piped('-W', '--showformat', self::DPKG_QUERY_FORMAT_STRING) do |pipe|
       # now turn each returned line into a package object
       pipe.each_line do |line|
-        if hash = parse_line(line)
+        hash = parse_line(line)
+        if hash
           packages << new(hash)
         end
       end
@@ -53,7 +54,8 @@ Puppet::Type.type(:package).provide :dpkg, :parent => Puppet::Provider::Package
   def self.parse_line(line)
     hash = nil
 
-    if match = self::FIELDS_REGEX.match(line)
+    match = self::FIELDS_REGEX.match(line)
+    if match
       hash = {}
 
       self::FIELDS.zip(match.captures) do |field,value|
@@ -78,7 +80,8 @@ Puppet::Type.type(:package).provide :dpkg, :parent => Puppet::Provider::Package
   public
 
   def install
-    unless file = @resource[:source]
+    file = @resource[:source]
+    unless file
       raise ArgumentError, _("You cannot install dpkg packages without a source")
     end
     args = []

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

@@ -56,7 +56,8 @@ Puppet::Type.type(:package).provide :fink, :parent => :dpkg, :source => :dpkg do
   # preseeds answers to dpkg-set-selection from the "responsefile"
   #
   def run_preseed
-    if response = @resource[:responsefile] and Puppet::FileSystem.exist?(response)
+    response = @resource[:responsefile]
+    if response && Puppet::FileSystem.exist?(response)
       self.info(_("Preseeding %{response} to debconf-set-selections") % { response: response })
 
       preseed response

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

@@ -82,7 +82,8 @@ Puppet::Type.type(:package).provide :gem, :parent => Puppet::Provider::Package::
     if options[:source]
       command_options << "--source" << options[:source]
     end
-    if name = options[:justme]
+    name = options[:justme]
+    if name
       command_options << '\A' + name + '\z'
     end
 
@@ -161,7 +162,8 @@ Puppet::Type.type(:package).provide :gem, :parent => Puppet::Provider::Package::
       command_options << "--no-document"
     end
 
-    if source = resource[:source]
+    source = resource[:source]
+    if source
       begin
         uri = URI.parse(source)
       rescue => detail

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

@@ -38,7 +38,8 @@ Puppet::Type.type(:package).provide :macports, :parent => Puppet::Provider::Pack
 
   def self.hash_from_line(line, regex, fields)
     hash = {}
-    if match = regex.match(line)
+    match = regex.match(line)
+    if match
       fields.zip(match.captures) { |field, value|
         hash[field] = value
       }
@@ -51,7 +52,8 @@ Puppet::Type.type(:package).provide :macports, :parent => Puppet::Provider::Pack
   def self.instances
     packages = []
     port("-q", :installed).each_line do |line|
-      if hash = parse_installed_query_line(line)
+      hash = parse_installed_query_line(line)
+      if hash
         packages << new(hash)
       end
     end
@@ -82,7 +84,8 @@ Puppet::Type.type(:package).provide :macports, :parent => Puppet::Provider::Pack
     info_line = execute([command(:port), "-q", :info, "--line", "--version", "--revision", @resource[:name]], :failonfail => false, :combine => false)
     return nil if info_line == ""
 
-    if newest = self.class.parse_info_query_line(info_line)
+    newest = self.class.parse_info_query_line(info_line)
+    if newest
       current = query
       # We're doing some fiddling behind the scenes here to cope with updated revisions.
       # If we're already at the latest version/revision, then just return the version

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

@@ -55,7 +55,8 @@ Puppet::Type.type(:package).provide :nim, :parent => :aix, :source => :aix do
   end
 
   def install(useversion = true)
-    unless source = @resource[:source]
+    source = @resource[:source]
+    unless source
       self.fail _("An LPP source location is required in 'source'")
     end
 
@@ -213,7 +214,8 @@ Puppet::Type.type(:package).provide :nim, :parent => :aix, :source => :aix do
   end
 
   def parse_installp_package_string(package_string)
-    unless match = package_string.match(self.class::INSTALLP_PACKAGE_REGEX)
+    match = package_string.match(self.class::INSTALLP_PACKAGE_REGEX)
+    unless match
       self.fail _("Unable to parse output from nimclient showres: package string does not match expected installp package string format:\n'%{package_string}'") % { package_string: package_string }
     end
     package_name = match.captures[0]
@@ -222,7 +224,8 @@ Puppet::Type.type(:package).provide :nim, :parent => :aix, :source => :aix do
   end
 
   def parse_rpm_package_string(package_string)
-    unless match = package_string.match(self.class::RPM_PACKAGE_REGEX)
+    match = package_string.match(self.class::RPM_PACKAGE_REGEX)
+    unless match
       self.fail _("Unable to parse output from nimclient showres: package string does not match expected rpm package string format:\n'%{package_string}'") % { package_string: package_string }
     end
     package_name = match.captures[0]
@@ -231,7 +234,8 @@ Puppet::Type.type(:package).provide :nim, :parent => :aix, :source => :aix do
   end
 
   def parse_showres_package_line(line)
-    unless match = line.match(self.class::PACKAGE_LINE_REGEX)
+    match = line.match(self.class::PACKAGE_LINE_REGEX)
+    unless match
       self.fail _("Unable to parse output from nimclient showres: line does not match expected package line format:\n'%{line}'") % { line: line }
     end
 

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

@@ -33,7 +33,8 @@ Puppet::Type.type(:package).provide :openbsd, :parent => Puppet::Provider::Packa
 
         # now turn each returned line into a package object
         process.each_line { |line|
-          if match = regex.match(line.split[0])
+          match = regex.match(line.split[0])
+          if match
             fields.zip(match.captures) { |field,value|
               hash[field] = value
             }
@@ -120,13 +121,17 @@ Puppet::Type.type(:package).provide :openbsd, :parent => Puppet::Provider::Packa
     unless @resource[:source]
       if Puppet::FileSystem.exist?("/etc/pkg.conf")
         File.open("/etc/pkg.conf", "rb").readlines.each do |line|
-          if matchdata = line.match(/^installpath\s*=\s*(.+)\s*$/i)
+          matchdata = line.match(/^installpath\s*=\s*(.+)\s*$/i)
+          if matchdata
             @resource[:source] = matchdata[1]
-          elsif matchdata = line.match(/^installpath\s*\+=\s*(.+)\s*$/i)
-            if @resource[:source].nil?
-              @resource[:source] = matchdata[1]
-            else
-              @resource[:source] += ":" + matchdata[1]
+          else
+            matchdata = line.match(/^installpath\s*\+=\s*(.+)\s*$/i)
+            if matchdata
+              if @resource[:source].nil?
+                @resource[:source] = matchdata[1]
+              else
+                @resource[:source] += ":" + matchdata[1]
+              end
             end
           end
         end
@@ -198,7 +203,8 @@ Puppet::Type.type(:package).provide :openbsd, :parent => Puppet::Provider::Packa
       version = -1
 
       process.each_line do |line|
-        if match = regex.match(line.split[0])
+        match = regex.match(line.split[0])
+        if match
           # now we return the first version, unless ensure is latest
           version = match.captures[1]
           return version unless @resource[:ensure] == "latest"

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

@@ -16,7 +16,8 @@ Puppet::Type.type(:package).provide :opkg, :source => :opkg, :parent => Puppet::
       hash = {}
 
       process.each_line { |line|
-        if match = regex.match(line)
+        match = regex.match(line)
+        if match
           fields.zip(match.captures) { |field,value| hash[field] = value }
           hash[:provider] = self.name
           packages << new(hash)

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

@@ -78,7 +78,8 @@ Puppet::Type.type(:package).provide :pacman, :parent => Puppet::Provider::Packag
         # pacman -Q output is 'packagename version-rel'
         regex = %r{^(\S+)\s(\S+)}
         pipe.each_line do |line|
-          if match = regex.match(line)
+          match = regex.match(line)
+          if match
             packages[match.captures[0]] = match.captures[1]
           else
             warning(_("Failed to match line '%{line}'") % { line: line })

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

@@ -69,7 +69,8 @@ Puppet::Type.type(:package).provide :pip, :parent => ::Puppet::Provider::Package
 
     execpipe [command, command_options] do |process|
       process.collect do |line|
-        next unless pkg = parse(line)
+        pkg = parse(line)
+        next unless pkg
         pkg[:command] = command
         packages << new(pkg)
       end

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

@@ -140,10 +140,12 @@ Puppet::Type.type(:package).provide :pkgdmg, :parent => Puppet::Provider::Packag
   end
 
   def install
-    unless source = @resource[:source]
+    source = @resource[:source]
+    unless source
       raise Puppet::Error.new(_("Mac OS X PKG DMGs must specify a package source."))
     end
-    unless name = @resource[:name]
+    name = @resource[:name]
+    unless name
       raise Puppet::Error.new(_("Mac OS X PKG DMGs must specify a package name."))
     end
     self.class.installpkgdmg(source,name)

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

@@ -29,7 +29,8 @@ Puppet::Type.type(:package).provide :pkgng, :parent => Puppet::Provider::Package
   end
 
   def self.get_latest_version(origin)
-    if latest_version = cached_version_list.lines.find { |l| l =~ /^#{origin} / }
+    latest_version = cached_version_list.lines.find { |l| l =~ /^#{origin} / }
+    if latest_version
       latest_version = latest_version.split(' ').last.split(')').first
       return latest_version
     end
@@ -74,7 +75,8 @@ Puppet::Type.type(:package).provide :pkgng, :parent => Puppet::Provider::Package
   def self.prefetch(resources)
     packages = instances
     resources.each_key do |name|
-      if provider = packages.find{|p| p.name == name or p.origin == name }
+      provider = packages.find{|p| p.name == name or p.origin == name }
+      if provider
         resources[name].provider = provider
       end
     end

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

@@ -169,7 +169,8 @@ Puppet::Type.type(:package).provide :pkgutil, :parent => :sun, :source => :sun d
   end
 
   def query
-    if hash = pkgsingle(@resource)
+    hash = pkgsingle(@resource)
+    if hash
       hash
     else
       {:ensure => :absent}

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

@@ -52,7 +52,8 @@ Puppet::Type.type(:package).provide :portupgrade, :parent => Puppet::Provider::P
     output.split("\n").each { |data|
       # reset hash to nil for each line
       hash.clear
-      if match = regex.match(data)
+      match = regex.match(data)
+      if match
         # Output matched regex
         fields.zip(match.captures) { |field, value|
           hash[field] = value

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

@@ -126,7 +126,8 @@ These options should be specified as an array where each element is either a str
 
   # Here we just retrieve the version from the file specified in the source.
   def latest
-    unless source = @resource[:source]
+    source = @resource[:source]
+    unless source
       @resource.fail _("RPMs must specify a package source")
     end
 
@@ -138,7 +139,8 @@ These options should be specified as an array where each element is either a str
   end
 
   def install
-    unless source = @resource[:source]
+    source = @resource[:source]
+    unless source
       @resource.fail _("RPMs must specify a package source")
     end
 
@@ -333,7 +335,8 @@ These options should be specified as an array where each element is either a str
     if ri
       v = s[0,ri]
       r = s[ri+1,s.length]
-      if arch = r.scan(ARCH_REGEX)[0]
+      arch = r.scan(ARCH_REGEX)[0]
+      if arch
         a = arch.gsub(/\./, '')
         r.gsub!(ARCH_REGEX, '')
       end
@@ -401,7 +404,8 @@ These options should be specified as an array where each element is either a str
     line.strip!
     hash = {}
 
-    if match = self::NEVRA_REGEX.match(line)
+    match = self::NEVRA_REGEX.match(line)
+    if match
       self::NEVRA_FIELDS.zip(match.captures) { |f, v| hash[f] = v }
       hash[:provider] = self.name
       hash[:ensure] = "#{hash[:version]}-#{hash[:release]}"

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

@@ -26,7 +26,8 @@ class Puppet::Provider::Package::Windows
         name = key.name.match(/^.+\\([^\\]+)$/).captures[0]
 
         [MsiPackage, ExePackage].find do |klass|
-          if pkg = klass.from_registry(name, values)
+          pkg = klass.from_registry(name, values)
+          if pkg
             yield pkg
           end
         end