puppet 4.10.12 → 5.0.0

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

@@ -98,7 +98,7 @@ class Puppet::Provider::NameService::DirectoryService < Puppet::Provider::NameSe
       begin
         dscl_output = execute(get_exec_preamble("-list"))
       rescue Puppet::ExecutionFailure
-        fail("Could not get #{@resource_type.name} list from DirectoryService")
+        fail(_("Could not get %{resource} list from DirectoryService") % { resource: @resource_type.name })
       end
       dscl_output.split("\n")
     end
@@ -157,7 +157,7 @@ class Puppet::Provider::NameService::DirectoryService < Puppet::Provider::NameSe
     begin
       dscl_output = execute(dscl_vector)
     rescue Puppet::ExecutionFailure
-      fail("Could not get report.  command execution failed.")
+      fail(_("Could not get report.  command execution failed."))
     end
 
     dscl_plist = self.parse_dscl_plist_data(dscl_output)
@@ -196,8 +196,8 @@ class Puppet::Provider::NameService::DirectoryService < Puppet::Provider::NameSe
     # zeroes. If someone attempts to use a password hash that worked with
     # a previous version of OS X, we will fail early and warn them.
     if password_hash.length != 136
-      fail("OS X 10.7 requires a Salted SHA512 hash password of 136 characters. \
-           Please check your password and try again.")
+      fail(_("OS X 10.7 requires a Salted SHA512 hash password of 136 characters. \
+           Please check your password and try again."))
     end
 
     plist_file = "#{users_plist_dir}/#{resource_name}.plist"
@@ -284,7 +284,7 @@ class Puppet::Provider::NameService::DirectoryService < Puppet::Provider::NameSe
     elsif id_type == 'gid'
       dscl_args << '/Groups' << 'gid'
     else
-      fail("Invalid id_type #{id_type}. Only 'uid' and 'gid' supported")
+      fail(_("Invalid id_type %{id_type}. Only 'uid' and 'gid' supported") % { id_type: id_type })
     end
     dscl_out = dscl(dscl_args)
     # We're ok with throwing away negative uids here.
@@ -333,7 +333,7 @@ class Puppet::Provider::NameService::DirectoryService < Puppet::Provider::NameSe
       guid = guid_plist["dsAttrTypeStandard:#{ns_to_ds_attribute_map[:guid]}"][0]
       self.class.set_password(@resource.name, guid, passphrase)
     rescue Puppet::ExecutionFailure => detail
-      fail("Could not set #{param} on #{@resource.class.name}[#{@resource.name}]: #{detail}")
+      fail(_("Could not set %{param} on %{resource}[%{name}]: %{detail}") % { param: param, resource: @resource.class.name, name: @resource.name, detail: detail })
     end
   end
 
@@ -362,7 +362,7 @@ class Puppet::Provider::NameService::DirectoryService < Puppet::Provider::NameSe
       begin
         execute(exec_arg_vector)
       rescue Puppet::ExecutionFailure => detail
-        fail("Could not set #{param} on #{@resource.class.name}[#{@resource.name}]: #{detail}")
+        fail(_("Could not set %{param} on %{resource}[%{name}]: %{detail}") % { param: param, resource: @resource.class.name, name: @resource.name, detail: detail })
       end
     end
   end
@@ -389,7 +389,7 @@ class Puppet::Provider::NameService::DirectoryService < Puppet::Provider::NameSe
     begin
       execute(exec_arg_vector)
     rescue Puppet::ExecutionFailure => detail
-      fail("Could not set GeneratedUID for #{@resource.class.name} #{@resource.name}: #{detail}")
+      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 != ""
@@ -417,7 +417,7 @@ class Puppet::Provider::NameService::DirectoryService < Puppet::Provider::NameSe
           begin
             execute(exec_arg_vector)
           rescue Puppet::ExecutionFailure => detail
-            fail("Could not create #{@resource.class.name} #{@resource.name}: #{detail}")
+            fail(_("Could not create %{resource} %{name}: %{detail}") % { resource: @resource.class.name, name: @resource.name, detail: detail })
           end
         end
       end
@@ -437,7 +437,7 @@ class Puppet::Provider::NameService::DirectoryService < Puppet::Provider::NameSe
           begin
             execute(cmd)
           rescue Puppet::ExecutionFailure => detail
-            fail("Could not remove #{member} from group: #{@resource.name}, #{detail}")
+            fail(_("Could not remove %{member} from group: %{resource}, %{detail}") % { member: member, resource: @resource.name, detail: detail })
           end
         end
       end
@@ -451,7 +451,7 @@ class Puppet::Provider::NameService::DirectoryService < Puppet::Provider::NameSe
         begin
           execute(cmd)
         rescue Puppet::ExecutionFailure => detail
-          fail("Could not add #{new_member} to group: #{@resource.name}, #{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/network_device.rb

@@ -22,7 +22,8 @@ class Puppet::Provider::NetworkDevice < Puppet::Provider
     end
   rescue => detail
     # Preserving behavior introduced in #6907
-    Puppet.log_exception(detail, "Could not perform network device prefetch: #{detail}")
+    #TRANSLATORS "prefetch" is a program name and should not be translated
+    Puppet.log_exception(detail, _("Could not perform network device prefetch: %{detail}") % { detail: detail })
   end
 
   def exists?

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

@@ -34,11 +34,11 @@ Puppet::Type.type(:package).provide :aix, :parent => Puppet::Provider::Package d
   end
 
   def self.prefetch(packages)
-    raise Puppet::Error, "The aix provider can only be used by root" if Process.euid != 0
+    raise Puppet::Error, _("The aix provider can only be used by root") if Process.euid != 0
 
     return unless packages.detect { |name, package| package.should(:ensure) == :latest }
 
-    sources = packages.collect { |name, package| package[:source] }.uniq.compact
+    sources = packages.collect { |name, package| package[:source] }.uniq
 
     updates = {}
     sources.each do |source|
@@ -76,13 +76,13 @@ Puppet::Type.type(:package).provide :aix, :parent => Puppet::Provider::Package d
     # installp will return an exit code of zero even if it didn't uninstall
     # anything... so let's make sure it worked.
     unless query().nil?
-      self.fail "Failed to uninstall package '#{@resource[:name]}'"
+      self.fail _("Failed to uninstall package '%{name}'") % { name: @resource[:name] }
     end
   end
 
   def install(useversion = true)
     unless source = @resource[:source]
-      self.fail "A directory is required which will be used to find packages"
+      self.fail _("A directory is required which will be used to find packages")
     end
 
     pkg = @resource[:name]
@@ -94,7 +94,7 @@ Puppet::Type.type(:package).provide :aix, :parent => Puppet::Provider::Package d
     # If the package is superseded, it means we're trying to downgrade and we
     # can't do that.
     if output =~ /^#{Regexp.escape(@resource[:name])}\s+.*\s+Already superseded by.*$/
-      self.fail "aix package provider is unable to downgrade packages"
+      self.fail _("aix package provider is unable to downgrade packages")
     end
   end
 
@@ -113,7 +113,7 @@ Puppet::Type.type(:package).provide :aix, :parent => Puppet::Provider::Package d
       if hash[:pkgname]
         return nil
       else
-        raise Puppet::Error, "Could not list installed Packages: #{detail}", detail.backtrace
+        raise Puppet::Error, _("Could not list installed Packages: %{detail}") % { detail: detail }, detail.backtrace
       end
     end
 

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

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

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

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

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

@@ -36,7 +36,7 @@ Puppet::Type.type(:package).provide :apt, :parent => :dpkg, :source => :dpkg do
 
     if have_cdrom and @resource[:allowcdrom] != :true
       raise Puppet::Error,
-        "/etc/apt/sources.list contains a cdrom source; not installing.  Use 'allowcdrom' to override this failure."
+        _("/etc/apt/sources.list contains a cdrom source; not installing.  Use 'allowcdrom' to override this failure.")
     end
   end
 
@@ -80,7 +80,7 @@ Puppet::Type.type(:package).provide :apt, :parent => :dpkg, :source => :dpkg do
     if output =~ /Candidate:\s+(\S+)\s/
       return $1
     else
-      self.err "Could not find latest version"
+      self.err _("Could not find latest version")
       return nil
     end
   end
@@ -90,11 +90,11 @@ Puppet::Type.type(:package).provide :apt, :parent => :dpkg, :source => :dpkg do
   #
   def run_preseed
     if response = @resource[:responsefile] and Puppet::FileSystem.exist?(response)
-      self.info("Preseeding #{response} to debconf-set-selections")
+      self.info(_("Preseeding %{response} to debconf-set-selections") % { response: response })
 
       preseed response
     else
-      self.info "No responsefile specified or non existent, not preseeding anything"
+      self.info _("No responsefile specified or non existent, not preseeding anything")
     end
   end
 

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

@@ -18,7 +18,7 @@ Puppet::Type.type(:package).provide :aptitude, :parent => :apt, :source => :dpkg
     # Yay, stupid aptitude doesn't throw an error when the package is missing.
     if args.include?(:install) and output =~ /Couldn't find any package/
       raise Puppet::Error.new(
-        "Could not find package #{self.name}"
+        _("Could not find package %{name}") % { name: self.name }
       )
     end
   end

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

@@ -50,7 +50,7 @@ Puppet::Type.type(:package).provide :aptrpm, :parent => :rpm, :source => :rpm do
         if version =~ /^([^\(]+)\(/
           $1
         else
-          self.warning "Could not match version '#{version}'"
+          self.warning _("Could not match version '%{version}'") % { version: version }
           nil
         end
       }.reject { |vers| vers.nil? }.sort { |a,b|
@@ -65,7 +65,7 @@ Puppet::Type.type(:package).provide :aptrpm, :parent => :rpm, :source => :rpm do
       # Get the latest and greatest version number
       return available_versions.pop
     else
-      self.err "Could not match string"
+      self.err _("Could not match string")
     end
   end
 

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

@@ -15,12 +15,12 @@ Puppet::Type.type(:package).provide :blastwave, :parent => :sun, :source => :sun
   def self.extended(mod)
     unless command(:pkgget) != "pkg-get"
       raise Puppet::Error,
-        "The pkg-get command is missing; blastwave packaging unavailable"
+        _("The pkg-get command is missing; blastwave packaging unavailable")
     end
 
     unless Puppet::FileSystem.exist?("/var/pkg-get/admin")
-      Puppet.notice "It is highly recommended you create '/var/pkg-get/admin'."
-      Puppet.notice "See /var/pkg-get/admin-fullauto"
+      Puppet.notice _("It is highly recommended you create '/var/pkg-get/admin'.")
+      Puppet.notice _("See /var/pkg-get/admin-fullauto")
     end
   end
 
@@ -77,7 +77,7 @@ Puppet::Type.type(:package).provide :blastwave, :parent => :sun, :source => :sun
 
       return hash
     else
-      Puppet.warning "Cannot match #{line}"
+      Puppet.warning _("Cannot match %{line}") % { line: line }
       return nil
     end
   end

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

@@ -28,7 +28,7 @@ Puppet::Type.type(:package).provide :dnf, :parent => :yum do
       end
   end
 
-  defaultfor :operatingsystem => :fedora, :operatingsystemmajrelease => (22..30).to_a
+  defaultfor :operatingsystem => :fedora, :operatingsystemmajrelease => ['22', '23', '24', '25']
 
   def self.update_command
     # In DNF, update is deprecated for upgrade

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

@@ -68,7 +68,7 @@ Puppet::Type.type(:package).provide :dpkg, :parent => Puppet::Provider::Package
         hash[:ensure] = :absent
       end
       hash[:ensure] = :held if hash[:desired] == 'hold'
-    else 
+    else
       Puppet.debug("Failed to match dpkg-query line #{line.inspect}")
     end
 
@@ -79,7 +79,7 @@ Puppet::Type.type(:package).provide :dpkg, :parent => Puppet::Provider::Package
 
   def install
     unless file = @resource[:source]
-      raise ArgumentError, "You cannot install dpkg packages without a source"
+      raise ArgumentError, _("You cannot install dpkg packages without a source")
     end
 
     args = []
@@ -105,7 +105,7 @@ Puppet::Type.type(:package).provide :dpkg, :parent => Puppet::Provider::Package
   def latest
     output = dpkg_deb "--show", @resource[:source]
     matches = /^(\S+)\t(\S+)$/.match(output).captures
-    warning "source doesn't contain named package, but #{matches[0]}" unless matches[0].match( Regexp.escape(@resource[:name]) )
+    warning _("source doesn't contain named package, but %{name}") % { name: matches[0] } unless matches[0].match( Regexp.escape(@resource[:name]) )
     matches[1]
   end
 

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

@@ -47,7 +47,7 @@ Puppet::Type.type(:package).provide :fink, :parent => :dpkg, :source => :dpkg do
     if output =~ /Candidate:\s+(\S+)\s/
       return $1
     else
-      self.err "Could not find latest version"
+      self.err _("Could not find latest version")
       return nil
     end
   end
@@ -57,11 +57,11 @@ Puppet::Type.type(:package).provide :fink, :parent => :dpkg, :source => :dpkg do
   #
   def run_preseed
     if response = @resource[:responsefile] and Puppet::FileSystem.exist?(response)
-      self.info("Preseeding #{response} to debconf-set-selections")
+      self.info(_("Preseeding %{response} to debconf-set-selections") % { response: response })
 
       preseed response
     else
-      self.info "No responsefile specified or non existent, not preseeding anything"
+      self.info _("No responsefile specified or non existent, not preseeding anything")
     end
   end
 

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

@@ -27,7 +27,7 @@ Puppet::Type.type(:package).provide :freebsd, :parent => :openbsd do
         end
       end
     else
-      Puppet.warning "source is defined but does not have trailing slash, ignoring #{@resource[:source]}" if @resource[:source]
+      Puppet.warning _("source is defined but does not have trailing slash, ignoring %{source}") % { source: @resource[:source] } if @resource[:source]
       pkgadd "-r", @resource[:name]
     end
   end

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

@@ -37,7 +37,7 @@ Puppet::Type.type(:package).provide :gem, :parent => Puppet::Provider::Package d
         map {|set| gemsplit(set) }.
         reject {|x| x.nil? }
     rescue Puppet::ExecutionFailure => detail
-      raise Puppet::Error, "Could not list gems: #{detail}", detail.backtrace
+      raise Puppet::Error, _("Could not list gems: %{detail}") % { detail: detail }, detail.backtrace
     end
 
     if options[:justme]
@@ -63,7 +63,7 @@ Puppet::Type.type(:package).provide :gem, :parent => Puppet::Provider::Package d
         :provider => name
       }
     else
-      Puppet.warning "Could not match #{desc}" unless desc.chomp.empty?
+      Puppet.warning _("Could not match %{desc}") % { desc: desc } unless desc.chomp.empty?
       nil
     end
   end
@@ -103,7 +103,7 @@ Puppet::Type.type(:package).provide :gem, :parent => Puppet::Provider::Package d
       begin
         uri = URI.parse(source)
       rescue => detail
-        self.fail Puppet::Error, "Invalid source '#{uri}': #{detail}", detail
+        self.fail Puppet::Error, _("Invalid source '%{uri}': %{detail}") % { uri: uri, detail: detail }, detail
       end
 
       case uri.scheme
@@ -114,7 +114,7 @@ Puppet::Type.type(:package).provide :gem, :parent => Puppet::Provider::Package d
         command << uri.path
       when 'puppet'
         # we don't support puppet:// URLs (yet)
-        raise Puppet::Error.new("puppet:// URLs are not supported as gem sources")
+        raise Puppet::Error.new(_("puppet:// URLs are not supported as gem sources"))
       else
         # check whether it's an absolute file path to help Windows out
         if Puppet::Util.absolute_path?(source)
@@ -132,7 +132,7 @@ Puppet::Type.type(:package).provide :gem, :parent => Puppet::Provider::Package d
 
     output = execute(command)
     # Apparently some stupid gem versions don't exit non-0 on failure
-    self.fail "Could not install: #{output.chomp}" if output.include?("ERROR")
+    self.fail _("Could not install: %{output}") % { output: output.chomp } if output.include?("ERROR")
   end
 
   def latest
@@ -157,7 +157,7 @@ Puppet::Type.type(:package).provide :gem, :parent => Puppet::Provider::Package d
     output = execute(command)
 
     # Apparently some stupid gem versions don't exit non-0 on failure
-    self.fail "Could not uninstall: #{output.chomp}" if output.include?("ERROR")
+    self.fail _("Could not uninstall: %{output}") % { output: output.chomp } if output.include?("ERROR")
   end
 
   def update

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

@@ -21,7 +21,7 @@ Puppet::Type.type(:package).provide :hpux, :parent => Puppet::Provider::Package
 
   # source and name are required
   def install
-    raise ArgumentError, "source must be provided to install HP-UX packages" unless resource[:source]
+    raise ArgumentError, _("source must be provided to install HP-UX packages") unless resource[:source]
     args = standard_args + ["-s", resource[:source], resource[:name]]
     swinstall(*args)
   end

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

@@ -44,19 +44,19 @@ Puppet::Type.type(:package).provide :nim, :parent => :aix, :source => :aix do
     when "R"
       rpm "-e", @resource[:name]
     else
-      self.fail("Unrecognized AIX package type identifier: '#{pkg_type}'")
+      self.fail(_("Unrecognized AIX package type identifier: '%{pkg_type}'") % { pkg_type: pkg_type })
     end
 
     # installp will return an exit code of zero even if it didn't uninstall
     # anything... so let's make sure it worked.
     unless query().nil?
-      self.fail "Failed to uninstall package '#{@resource[:name]}'"
+      self.fail _("Failed to uninstall package '%{name}'") % { name: @resource[:name] }
     end
   end
 
   def install(useversion = true)
     unless source = @resource[:source]
-      self.fail "An LPP source location is required in 'source'"
+      self.fail _("An LPP source location is required in 'source'")
     end
 
     pkg = @resource[:name]
@@ -97,10 +97,13 @@ Puppet::Type.type(:package).provide :nim, :parent => :aix, :source => :aix do
     end
 
     if (package_type == nil)
-      errmsg = "Unable to find package '#{pkg}' "
+      #TRANSLATORS Full message: "Unable to find package #{pkg} with version #{version} on lpp_source #{source}"
+      errmsg = _("Unable to find package '%{pkg}' ") % { pkg: pkg }
       if (version_specified)
-        errmsg << "with version '#{version}' "
+        #TRANSLATORS Full message: "Unable to find package #{pkg} with version #{version} on lpp_source #{source}"
+        errmsg << _("with version '%{version}' ") % { version: version }
       end
+      #TRANSLATORS Full message: "Unable to find package #{pkg} with version #{version} on lpp_source #{source}"
       errmsg << "on lpp_source '#{source}'"
       self.fail errmsg
     end
@@ -133,11 +136,11 @@ Puppet::Type.type(:package).provide :nim, :parent => :aix, :source => :aix do
     case package_type
     when :installp
       if output =~ /^#{Regexp.escape(@resource[:name])}\s+.*\s+Already superseded by.*$/
-        self.fail "NIM package provider is unable to downgrade packages"
+        self.fail _("NIM package provider is unable to downgrade packages")
       end
     when :rpm
       if output =~ /^#{Regexp.escape(@resource[:name])}.* is superseded by.*$/
-        self.fail "NIM package provider is unable to downgrade packages"
+        self.fail _("NIM package provider is unable to downgrade packages")
       end
     end
   end
@@ -206,13 +209,13 @@ Puppet::Type.type(:package).provide :nim, :parent => :aix, :source => :aix do
     # looks sane, so we know we're dealing with the kind of output that we
     # are capable of handling.
     unless line.match(self.class::HEADER_LINE_REGEX)
-      self.fail "Unable to parse output from nimclient showres: line does not match expected package header format:\n'#{line}'"
+      self.fail _("Unable to parse output from nimclient showres: line does not match expected package header format:\n'%{line}'") % { line: line }
     end
   end
 
   def parse_installp_package_string(package_string)
     unless match = package_string.match(self.class::INSTALLP_PACKAGE_REGEX)
-      self.fail "Unable to parse output from nimclient showres: package string does not match expected installp package string format:\n'#{package_string}'"
+      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]
     version = match.captures[1]
@@ -221,7 +224,7 @@ Puppet::Type.type(:package).provide :nim, :parent => :aix, :source => :aix do
 
   def parse_rpm_package_string(package_string)
     unless match = package_string.match(self.class::RPM_PACKAGE_REGEX)
-      self.fail "Unable to parse output from nimclient showres: package string does not match expected rpm package string format:\n'#{package_string}'"
+      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]
     version = match.captures[1]
@@ -230,7 +233,7 @@ Puppet::Type.type(:package).provide :nim, :parent => :aix, :source => :aix do
 
   def parse_showres_package_line(line)
     unless match = line.match(self.class::PACKAGE_LINE_REGEX)
-      self.fail "Unable to parse output from nimclient showres: line does not match expected package line format:\n'#{line}'"
+      self.fail _("Unable to parse output from nimclient showres: line does not match expected package line format:\n'%{line}'") % { line: line }
     end
 
     package_type_flag = match.captures[0]
@@ -242,7 +245,7 @@ Puppet::Type.type(:package).provide :nim, :parent => :aix, :source => :aix do
       when "R"
         parse_rpm_package_string(package_string)
       else
-        self.fail "Unrecognized package type specifier: '#{package_type_flag}' in package line:\n'#{line}'"
+        self.fail _("Unrecognized package type specifier: '%{package_type_flag}' in package line:\n'%{line}'") % { package_type_flag: package_type_flag, line: line }
     end
   end