puppet 5.0.1-x86-mingw32 → 5.1.0-x86-mingw32

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

@@ -3,10 +3,12 @@ require 'uri'
 
 # Ruby gems support.
 Puppet::Type.type(:package).provide :gem, :parent => Puppet::Provider::Package do
-  desc "Ruby Gem support.  If a URL is passed via `source`, then that URL is used as the
-    remote gem repository; if a source is present but is not a valid URL, it will be
-    interpreted as the path to a local gem file.  If source is not present at all,
-    the gem will be installed from the default gem repositories.
+  desc "Ruby Gem support. If a URL is passed via `source`, then that URL is
+    appended to the list of remote gem repositories; to ensure that only the
+    specified source is used, also pass `--clear-sources` via `install_options`.
+    If source is present but is not a valid URL, it will be interpreted as the
+    path to a local gem file. If source is not present, the gem will be
+    installed from the default gem repositories.
 
     This provider supports the `install_options` and `uninstall_options` attributes,
     which allow command-line flags to be passed to the gem command.
@@ -33,7 +35,7 @@ Puppet::Type.type(:package).provide :gem, :parent => Puppet::Provider::Package d
     end
 
     begin
-      list = execute(gem_list_command).lines.
+      list = execute(gem_list_command, {:failonfail => true, :combine => true, :custom_environment => {"HOME"=>ENV["HOME"]}}).lines.
         map {|set| gemsplit(set) }.
         reject {|x| x.nil? }
     rescue Puppet::ExecutionFailure => detail
@@ -92,6 +94,7 @@ Puppet::Type.type(:package).provide :gem, :parent => Puppet::Provider::Package d
 
   def install(useversion = true)
     command = [command(:gemcmd), "install"]
+    command += install_options if resource[:install_options]
     if Puppet.features.microsoft_windows?
       version = resource[:ensure]
       command << "-v" << %Q["#{version}"] if (! resource[:ensure].is_a? Symbol) and useversion
@@ -128,9 +131,7 @@ Puppet::Type.type(:package).provide :gem, :parent => Puppet::Provider::Package d
       command << "--no-rdoc" << "--no-ri" << resource[:name]
     end
 
-    command += install_options if resource[:install_options]
-
-    output = execute(command)
+    output = execute(command, {:failonfail => true, :combine => true, :custom_environment => {"HOME"=>ENV["HOME"]}})
     # Apparently some stupid gem versions don't exit non-0 on failure
     self.fail _("Could not install: %{output}") % { output: output.chomp } if output.include?("ERROR")
   end
@@ -154,7 +155,7 @@ Puppet::Type.type(:package).provide :gem, :parent => Puppet::Provider::Package d
 
     command += uninstall_options if resource[:uninstall_options]
 
-    output = execute(command)
+    output = execute(command, {:failonfail => true, :combine => true, :custom_environment => {"HOME"=>ENV["HOME"]}})
 
     # Apparently some stupid gem versions don't exit non-0 on failure
     self.fail _("Could not uninstall: %{output}") % { output: output.chomp } if output.include?("ERROR")

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

@@ -31,7 +31,11 @@ Puppet::Type.type(:package).provide :pip,
     packages = []
     pip_cmd = self.pip_cmd
     return [] unless pip_cmd
-    execpipe "#{pip_cmd} freeze" do |process|
+    command = [pip_cmd, 'freeze']
+    if Puppet::Util::Package.versioncmp(self.pip_version, '8.1.0') >= 0 # a >= b
+      command << '--all'
+    end
+    execpipe command do |process|
       process.collect do |line|
         next unless options = parse(line)
         packages << new(options)
@@ -40,7 +44,8 @@ Puppet::Type.type(:package).provide :pip,
 
     # Pip can also upgrade pip, but it's not listed in freeze so need to special case it
     # Pip list would also show pip installed version, but "pip list" doesn't exist for older versions of pip (E.G v1.0)
-    if version = self.pip_version
+    # Not needed when "pip freeze --all" is available
+    if Puppet::Util::Package.versioncmp(self.pip_version, '8.1.0') == -1 && version = self.pip_version
       packages << new({:ensure => version, :name => File.basename(pip_cmd), :provider => name})
     end
 
@@ -48,7 +53,11 @@ Puppet::Type.type(:package).provide :pip,
   end
 
   def self.cmd
-    ["pip", "pip-python"]
+    if Puppet.features.microsoft_windows?
+      ["pip.exe"]
+    else
+      ["pip", "pip-python"]
+    end
   end
 
   def self.pip_cmd

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

@@ -106,7 +106,15 @@ Puppet::Type.type(:package).provide :yum, :parent => :rpm, :source => :rpm do
   end
 
   def self.update_to_hash(pkgname, pkgversion)
-    name, arch = pkgname.split('.')
+    
+    # The pkgname string has two parts: name, and architecture. Architecture
+    # is the portion of the string following the last "." character. All
+    # characters preceding the final dot are the package name. Parse out
+    # these two pieces of component data.
+    name, _, arch = pkgname.rpartition('.')
+    if name.empty?
+      raise _("Failed to parse package name and architecture from '%{pkgname}'") % { pkgname: pkgname }
+    end
 
     match = pkgversion.match(/^(?:(\d+):)?(\S+)-(\S+)$/)
     epoch = match[1] || '0'

data/lib/puppet/resource/capability_finder.rb

@@ -19,7 +19,7 @@ module Puppet::Resource::CapabilityFinder
   #
   # @param environment [String] environment name
   # @param code_id [String,nil] code_id of the catalog
-  # @param cap [Puppet::Type] the capability resource type instance
+  # @param cap [Puppet::Resource] the capability resource type instance
   # @return [Puppet::Resource,nil] The found capability resource or `nil` if it could not be found
   def self.find(environment, code_id, cap)
     unless Puppet::Util.const_defined?('Puppetdb')
@@ -33,24 +33,22 @@ module Puppet::Resource::CapabilityFinder
       resources = resources.select { |r| r['tags'].any? { |t| t == "producer:#{environment}" } }
     end
 
-    if resources.size > 1 && code_id
-      Puppet.debug "Found multiple resources when looking up capability #{cap}, filtering by code id #{code_id}"
-      resources = search(environment, code_id, cap)
-    end
-
-    if resources.size > 1
+    if resources.empty?
+      Puppet.debug "Could not find capability resource #{cap} in PuppetDB"
+    elsif resources.size == 1
+      resource_hash = resources.first
+    elsif code_id_resource = disambiguate_by_code_id(environment, code_id, cap)
+      resource_hash = code_id_resource
+    else
       raise Puppet::DevError,
         "Unexpected response from PuppetDB when looking up #{cap}:\n" \
         "expected exactly one resource but got #{resources.size};\n" \
         "returned data is:\n#{resources.inspect}"
     end
 
-    if resource_hash = resources.first
+    if resource_hash
       resource_hash['type'] = cap.resource_type
       instantiate_resource(resource_hash)
-    else
-      Puppet.debug "Could not find capability resource #{cap} in PuppetDB"
-      nil
     end
   end
 
@@ -111,6 +109,27 @@ module Puppet::Resource::CapabilityFinder
 
   private
 
+  # Find a distinct copy of the given capability resource by searching for only
+  # resources matching the given code_id. Returns `nil` if no code_id is
+  # supplied or if there isn't exactly one matching resource.
+  #
+  # @param environment [String] environment name
+  # @param code_id [String,nil] code_id of the catalog
+  # @param cap [Puppet::Resource] the capability resource type instance
+  def self.disambiguate_by_code_id(environment, code_id, cap)
+    if code_id
+      Puppet.debug "Found multiple resources when looking up capability #{cap}, filtering by code id #{code_id}"
+      resources = search(environment, code_id, cap)
+
+      if resources.size > 1
+        Puppet.debug "Found multiple resources matching code id #{code_id} when looking up #{cap}"
+        nil
+      else
+        resources.first
+      end
+    end
+  end
+
   def self.instantiate_resource(resource_hash)
     real_type = resource_hash['type']
     resource = Puppet::Resource.new(real_type, resource_hash['title'])

data/lib/puppet/type/file.rb

@@ -714,7 +714,7 @@ Puppet::Type.newtype(:file) do
   #
   # @param  [Symbol] should The file type replacing the current content.
   # @return [Boolean] True if the file was removed, else False
-  # @raises [fail???] If the current file isn't one of %w{file link directory} and can't be removed.
+  # @raises [fail???] If the file could not be backed up or could not be removed.
   def remove_existing(should)
     wanted_type = should.to_s
     current_type = read_current_type
@@ -723,8 +723,12 @@ Puppet::Type.newtype(:file) do
       return false
     end
 
-    if can_backup?(current_type)
-      backup_existing
+    if self[:backup]
+      if can_backup?(current_type)
+        backup_existing
+      else
+        self.warning "Could not back up file of type #{current_type}"
+      end
     end
 
     if wanted_type != "link" and current_type == wanted_type
@@ -734,10 +738,11 @@ Puppet::Type.newtype(:file) do
     case current_type
     when "directory"
       return remove_directory(wanted_type)
-    when "link", "file"
+    when "link", "file", "fifo", "socket"
       return remove_file(current_type, wanted_type)
     else
-      self.fail _("Could not back up files of type %{current_type}") % { current_type: current_type }
+      # Including: “blockSpecial”, “characterSpecial”, “unknown”
+      self.fail _("Could not remove files of type %{current_type}") % { current_type: current_type }
     end
   end
 
@@ -930,18 +935,21 @@ Puppet::Type.newtype(:file) do
     end
   end
 
-  # @return [Boolean] If the current file can be backed up and needs to be backed up.
+  # @return [Boolean] If the current file should be backed up and can be backed up.
   def can_backup?(type)
-    if type == "directory" and not force?
-      # (#18110) Directories cannot be removed without :force, so it doesn't
-      # make sense to back them up.
-      false
-    else
+    if type == "directory" and force?
+      # (#18110) Directories cannot be removed without :force,
+      # so it doesn't make sense to back them up unless removing with :force.
       true
+    elsif type == "file" or type == "link"
+      true
+    else
+      # Including: “blockSpecial”, “characterSpecial”, "fifo", "socket", “unknown”
+      false
     end
   end
 
-  # @return [Boolean] True if the directory was removed
+  # @return [Boolean] if the directory was removed (which is always true currently)
   # @api private
   def remove_directory(wanted_type)
     if force?
@@ -975,7 +983,7 @@ Puppet::Type.newtype(:file) do
   def backup_existing
     unless perform_backup
       #TRANSLATORS refers to a file which could not be backed up
-      raise Puppet::Error, _("Could not back up; will not replace")
+      raise Puppet::Error, _("Could not back up; will not remove")
     end
   end
 

data/lib/puppet/util/execution.rb

@@ -188,18 +188,69 @@ module Puppet::Util::Execution
 
     begin
       stdin = Puppet::FileSystem.open(options[:stdinfile] || null_file, nil, 'r')
-      stdout = options[:squelch] ? Puppet::FileSystem.open(null_file, nil, 'w') : Puppet::FileSystem::Uniquefile.new('puppet')
+      # On Windows, continue to use the file-based approach to avoid breaking people's existing
+      # manifests. If they use a script that doesn't background cleanly, such as
+      # `start /b ping 127.0.0.1`, we couldn't handle it with pipes as there's no non-blocking
+      # read available.
+      if options[:squelch]
+        stdout = Puppet::FileSystem.open(null_file, nil, 'w')
+      elsif Puppet.features.posix?
+        reader, stdout = IO.pipe
+      else
+        stdout = Puppet::FileSystem::Uniquefile.new('puppet')
+      end
       stderr = options[:combine] ? stdout : Puppet::FileSystem.open(null_file, nil, 'w')
 
       exec_args = [command, options, stdin, stdout, stderr]
+      output = ''
 
+      # We close stdin/stdout/stderr immediately after fork/exec as they're no longer needed by
+      # this process. In most cases they could be closed later, but when `stdout` is the "writer"
+      # pipe we must close it or we'll never reach eof on the `reader` pipe.
       if execution_stub = Puppet::Util::ExecutionStub.current_value
-        return execution_stub.call(*exec_args)
+        child_pid = execution_stub.call(*exec_args)
+        [stdin, stdout, stderr].each {|io| io.close rescue nil}
+        return child_pid
       elsif Puppet.features.posix?
         child_pid = nil
         begin
           child_pid = execute_posix(*exec_args)
-          exit_status = Process.waitpid2(child_pid).last.exitstatus
+          [stdin, stdout, stderr].each {|io| io.close rescue nil}
+          if options[:squelch]
+            exit_status = Process.waitpid2(child_pid).last.exitstatus
+          else
+            # Use non-blocking read to check for data. After each attempt,
+            # check whether the child is done. This is done in case the child
+            # forks and inherits stdout, as happens in `foo &`.
+            until results = Process.waitpid2(child_pid, Process::WNOHANG)
+
+              # If not done, wait for data to read with a timeout
+              # This timeout is selected to keep activity low while waiting on
+              # a long process, while not waiting too long for the pathological
+              # case where stdout is never closed.
+              ready = IO.select([reader], [], [], 0.1)
+              begin
+                output << reader.read_nonblock(4096) if ready
+              rescue Errno::EAGAIN
+              rescue EOFError
+              end
+            end
+
+            # Read any remaining data. Allow for but don't expect EOF.
+            begin
+              loop do
+                output << reader.read_nonblock(4096)
+              end
+            rescue Errno::EAGAIN
+            rescue EOFError
+            end
+
+            # Force to external encoding to preserve prior behavior when reading a file.
+            # Wait until after reading all data so we don't encounter corruption when
+            # reading part of a multi-byte unicode character if default_external is UTF-8.
+            output.force_encoding(Encoding.default_external)
+            exit_status = results.last.exitstatus
+          end
           child_pid = nil
         rescue Timeout::Error => e
           # NOTE: For Ruby 2.1+, an explicit Timeout::Error class has to be
@@ -216,28 +267,30 @@ module Puppet::Util::Execution
       elsif Puppet.features.microsoft_windows?
         process_info = execute_windows(*exec_args)
         begin
+          [stdin, stderr].each {|io| io.close rescue nil}
           exit_status = Puppet::Util::Windows::Process.wait_process(process_info.process_handle)
+
+          # read output in if required
+          unless options[:squelch]
+            output = wait_for_output(stdout)
+            Puppet.warning _("Could not get output") unless output
+          end
         ensure
           FFI::WIN32.CloseHandle(process_info.process_handle)
           FFI::WIN32.CloseHandle(process_info.thread_handle)
         end
       end
 
-      [stdin, stdout, stderr].each {|io| io.close rescue nil}
-
-      # read output in if required
-      unless options[:squelch]
-        output = wait_for_output(stdout)
-        Puppet.warning _("Could not get output") unless output
-      end
-
       if options[:failonfail] and exit_status != 0
         raise Puppet::ExecutionFailure, _("Execution of '%{str}' returned %{exit_status}: %{output}") % { str: command_str, exit_status: exit_status, output: output.strip }
       end
     ensure
-      if !options[:squelch] && stdout
-        # if we opened a temp file for stdout, we need to clean it up.
-        stdout.close!
+      # Make sure all handles are closed in case an exception was thrown attempting to execute.
+      [stdin, stdout, stderr].each {|io| io.close rescue nil}
+      if !options[:squelch]
+        # if we opened a pipe, we need to clean it up.
+        reader.close if reader
+        stdout.close! if Puppet.features.microsoft_windows?
       end
     end
 

data/lib/puppet/util/suidmanager.rb

@@ -141,6 +141,7 @@ module Puppet::Util::SUIDManager
 
   # Make sure the passed argument is a number.
   def convert_xid(type, id)
+    return id if id.kind_of? Integer
     map = {:gid => :group, :uid => :user}
     raise ArgumentError, _("Invalid id type %{type}") % { type: type } unless map.include?(type)
     ret = Puppet::Util.send(type, id)

data/lib/puppet/version.rb

@@ -6,7 +6,7 @@
 # Raketasks and such to set the version based on the output of `git describe`
 
 module Puppet
-  PUPPETVERSION = '5.0.1'
+  PUPPETVERSION = '5.1.0'
 
   ##
   # version is a public API method intended to always provide a fast and

data/locales/puppet.pot

@@ -6,11 +6,11 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Puppet automation framework 5.0.0-77-g7f53ea2\n"
+"Project-Id-Version: Puppet automation framework 5.0.1-184-gc50f87a\n"
 "\n"
 "Report-Msgid-Bugs-To: https://tickets.puppetlabs.com\n"
-"POT-Creation-Date: 2017-07-14 22:07+0000\n"
-"PO-Revision-Date: 2017-07-14 22:07+0000\n"
+"POT-Creation-Date: 2017-08-01 23:58+0000\n"
+"PO-Revision-Date: 2017-08-01 23:58+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
@@ -49,15 +49,15 @@ msgstr ""
 msgid "Could not run %{client_class}: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/agent.rb:57
+#: ../lib/puppet/agent.rb:58
 msgid "Shutdown/restart in progress (%{status}); skipping run"
 msgstr ""
 
-#: ../lib/puppet/agent.rb:75
+#: ../lib/puppet/agent.rb:76
 msgid "puppet agent: applying configuration"
 msgstr ""
 
-#: ../lib/puppet/agent.rb:106
+#: ../lib/puppet/agent.rb:107
 msgid "Could not create instance of %{client_class}: %{detail}"
 msgstr ""
 
@@ -1778,51 +1778,51 @@ msgstr ""
 msgid "No loader present. Call create_loaded_function(:myname, loader,...), instead of 'create_function' if running tests"
 msgstr ""
 
-#: ../lib/puppet/functions.rb:410
+#: ../lib/puppet/functions.rb:409
 msgid "A required parameter cannot be added after an optional parameter"
 msgstr ""
 
-#: ../lib/puppet/functions.rb:459
+#: ../lib/puppet/functions.rb:458
 msgid "A required repeated parameter cannot be added after an optional parameter"
 msgstr ""
 
-#: ../lib/puppet/functions.rb:481
+#: ../lib/puppet/functions.rb:480
 msgid "block_param accepts max 2 arguments (type, name), got %{size}."
 msgstr ""
 
-#: ../lib/puppet/functions.rb:485
+#: ../lib/puppet/functions.rb:484
 msgid "Expected PCallableType or PVariantType thereof, got %{type_class}"
 msgstr ""
 
-#: ../lib/puppet/functions.rb:489
+#: ../lib/puppet/functions.rb:488
 msgid "Expected block_param name to be a Symbol, got %{name_class}"
 msgstr ""
 
-#: ../lib/puppet/functions.rb:496
+#: ../lib/puppet/functions.rb:495
 msgid "Attempt to redefine block"
 msgstr ""
 
-#: ../lib/puppet/functions.rb:517
+#: ../lib/puppet/functions.rb:516
 msgid "Argument to 'return_type' must be a String reference to a Puppet Data Type. Got %{type_class}"
 msgstr ""
 
-#: ../lib/puppet/functions.rb:525
+#: ../lib/puppet/functions.rb:524
 msgid "Parameters cannot be added after a block parameter"
 msgstr ""
 
-#: ../lib/puppet/functions.rb:526
+#: ../lib/puppet/functions.rb:525
 msgid "Parameters cannot be added after a repeated parameter"
 msgstr ""
 
-#: ../lib/puppet/functions.rb:529
+#: ../lib/puppet/functions.rb:528
 msgid "Parameter name argument must be a Symbol. Got %{name_class}"
 msgstr ""
 
-#: ../lib/puppet/functions.rb:542
+#: ../lib/puppet/functions.rb:541
 msgid "Parameter 'type' must be a String reference to a Puppet Data Type. Got %{type_class}"
 msgstr ""
 
-#: ../lib/puppet/functions.rb:607
+#: ../lib/puppet/functions.rb:606
 msgid "Expected a type alias assignment on the form 'AliasType = T', got '%{assignment_string}'"
 msgstr ""
 
@@ -2502,6 +2502,14 @@ msgstr ""
 msgid "VersionRanges will always be strict when using non-vendored SemanticPuppet gem, version %{version}"
 msgstr ""
 
+#: ../lib/puppet/module.rb:104
+msgid "GettextSetup initialization for %{module_name} failed with: %{error_message}"
+msgstr ""
+
+#: ../lib/puppet/module.rb:107
+msgid "GettextSetup is not available, skipping GettextSetup initialization for %{module_name}."
+msgstr ""
+
 #: ../lib/puppet/module_tool.rb:37
 msgid "Not a valid full name: %{full_module_name}"
 msgstr ""
@@ -3666,27 +3674,59 @@ msgstr ""
 msgid "Only subclasses can override parameters"
 msgstr ""
 
-#: ../lib/puppet/parser/resource.rb:254
+#: ../lib/puppet/parser/resource.rb:174
+msgid "Attempt to override an already evaluated resource%{location} with new values"
+msgstr ""
+
+#: ../lib/puppet/parser/resource.rb:175
+msgid ", defined"
+msgstr ""
+
+#: ../lib/puppet/parser/resource.rb:266
 msgid "Invalid consume in %{value0}: %{ref} is not a resource"
 msgstr ""
 
-#: ../lib/puppet/parser/resource.rb:261
+#: ../lib/puppet/parser/resource.rb:273
 msgid "Resource %{ref} could not be found; it might not have been produced yet"
 msgstr ""
 
-#: ../lib/puppet/parser/resource.rb:265
+#: ../lib/puppet/parser/resource.rb:277
 msgid "Invalid consume in %{ref}: %{cap} is not a capability resource"
 msgstr ""
 
-#: ../lib/puppet/parser/resource.rb:274
+#: ../lib/puppet/parser/resource.rb:286
 msgid "Resource %{res} tries to consume %{cns} but no 'consumes' mapping exists for %{resource_type} and %{cns_type}"
 msgstr ""
 
-#: ../lib/puppet/parser/resource.rb:293
+#: ../lib/puppet/parser/resource.rb:305
 msgid "Attempt to reassign attribute '%{name}' in '%{resource}' caused by multiple consumed mappings to the same attribute"
 msgstr ""
 
-#: ../lib/puppet/parser/resource.rb:384
+#: ../lib/puppet/parser/resource.rb:336
+msgid "%{prefix} at %{file}:%{line}%{suffix}"
+msgstr ""
+
+#: ../lib/puppet/parser/resource.rb:338
+msgid "%{prefix} in %{file}%{suffix}"
+msgstr ""
+
+#: ../lib/puppet/parser/resource.rb:341
+msgid "%{prefix} at line %{line}%{suffix}"
+msgstr ""
+
+#: ../lib/puppet/parser/resource.rb:374
+msgid "Parameter '%{name}' is already set on %{resource}"
+msgstr ""
+
+#: ../lib/puppet/parser/resource.rb:375
+msgid " by %{source}"
+msgstr ""
+
+#: ../lib/puppet/parser/resource.rb:377
+msgid "; cannot redefine"
+msgstr ""
+
+#: ../lib/puppet/parser/resource.rb:413
 msgid "Duplicate parameter '%{param}' for on %{resource}"
 msgstr ""
 
@@ -4621,7 +4661,7 @@ msgstr ""
 msgid "Attempt to redefine already initialized loaders for environment"
 msgstr ""
 
-#: ../lib/puppet/pops/loaders.rb:170
+#: ../lib/puppet/pops/loaders.rb:169
 msgid "Unable to find loader named '%{loader_name}'"
 msgstr ""
 
@@ -4663,47 +4703,47 @@ msgstr ""
 msgid "Recursive lookup detected in [%{name_stack}]"
 msgstr ""
 
-#: ../lib/puppet/pops/lookup/lookup_adapter.rb:93
+#: ../lib/puppet/pops/lookup/lookup_adapter.rb:94
 msgid "Lookup of key '%{key}' failed: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/pops/lookup/lookup_adapter.rb:239
+#: ../lib/puppet/pops/lookup/lookup_adapter.rb:240
 msgid "value of %{opts} must be a hash"
 msgstr ""
 
-#: ../lib/puppet/pops/lookup/lookup_adapter.rb:246
+#: ../lib/puppet/pops/lookup/lookup_adapter.rb:247
 msgid "all %{opts} patterns must match a key starting with module name '%{module_name}'"
 msgstr ""
 
-#: ../lib/puppet/pops/lookup/lookup_adapter.rb:250
+#: ../lib/puppet/pops/lookup/lookup_adapter.rb:251
 msgid "all %{opts} keys must start with module name '%{module_name}'"
 msgstr ""
 
-#: ../lib/puppet/pops/lookup/lookup_adapter.rb:375
+#: ../lib/puppet/pops/lookup/lookup_adapter.rb:376
 msgid "Defining \"data_provider\": \"%{name}\" in metadata.json is deprecated. It is ignored since a '%{config}' with version >= 5 is present"
 msgstr ""
 
-#: ../lib/puppet/pops/lookup/lookup_adapter.rb:385
+#: ../lib/puppet/pops/lookup/lookup_adapter.rb:386
 msgid "Defining \"data_provider\": \"%{name}\" in metadata.json is deprecated"
 msgstr ""
 
-#: ../lib/puppet/pops/lookup/lookup_adapter.rb:386 ../lib/puppet/pops/lookup/lookup_adapter.rb:440
+#: ../lib/puppet/pops/lookup/lookup_adapter.rb:387 ../lib/puppet/pops/lookup/lookup_adapter.rb:441
 msgid ". A '%{config}' file should be used instead"
 msgstr ""
 
-#: ../lib/puppet/pops/lookup/lookup_adapter.rb:400
+#: ../lib/puppet/pops/lookup/lookup_adapter.rb:401
 msgid "Environment '%{env}', cannot find module_data_provider '%{provider}'"
 msgstr ""
 
-#: ../lib/puppet/pops/lookup/lookup_adapter.rb:424 ../lib/puppet/pops/lookup/lookup_adapter.rb:439
+#: ../lib/puppet/pops/lookup/lookup_adapter.rb:425 ../lib/puppet/pops/lookup/lookup_adapter.rb:440
 msgid "Defining environment_data_provider='%{provider_name}' in environment.conf is deprecated"
 msgstr ""
 
-#: ../lib/puppet/pops/lookup/lookup_adapter.rb:428
+#: ../lib/puppet/pops/lookup/lookup_adapter.rb:429
 msgid "The environment_data_provider='%{provider_name}' setting is ignored since '%{config_path}' version >= 5"
 msgstr ""
 
-#: ../lib/puppet/pops/lookup/lookup_adapter.rb:455
+#: ../lib/puppet/pops/lookup/lookup_adapter.rb:456
 msgid "Environment '%{env}', cannot find environment_data_provider '%{provider}'"
 msgstr ""
 
@@ -4751,7 +4791,7 @@ msgstr ""
 msgid "Integer out of bounds"
 msgstr ""
 
-#: ../lib/puppet/pops/serialization/deserializer.rb:46 ../lib/puppet/pops/serialization/from_data_converter.rb:82 ../lib/puppet/pops/serialization/from_data_converter.rb:174
+#: ../lib/puppet/pops/serialization/deserializer.rb:46 ../lib/puppet/pops/serialization/from_data_converter.rb:82
 msgid "No implementation mapping found for Puppet Type %{type_name}"
 msgstr ""
 
@@ -4803,7 +4843,7 @@ msgstr ""
 msgid "No Puppet Type found for %{klass}"
 msgstr ""
 
-#: ../lib/puppet/pops/time/timespan.rb:112 ../lib/puppet/pops/time/timestamp.rb:81
+#: ../lib/puppet/pops/time/timespan.rb:112 ../lib/puppet/pops/time/timestamp.rb:83
 msgid "Unable to parse '%{str}' using any of the formats %{formats}"
 msgstr ""
 
@@ -4847,19 +4887,19 @@ msgstr ""
 msgid "Illegal timezone '%{timezone}'"
 msgstr ""
 
-#: ../lib/puppet/pops/time/timestamp.rb:87
+#: ../lib/puppet/pops/time/timestamp.rb:89
 msgid "Unable to parse '%{str}' using format '%{format}'"
 msgstr ""
 
-#: ../lib/puppet/pops/time/timestamp.rb:97
+#: ../lib/puppet/pops/time/timestamp.rb:92
 msgid "Using a Timezone designator in format specification is mutually exclusive to providing an explicit timezone argument"
 msgstr ""
 
-#: ../lib/puppet/pops/time/timestamp.rb:116
+#: ../lib/puppet/pops/time/timestamp.rb:128
 msgid "%{klass} cannot be added to a Timestamp"
 msgstr ""
 
-#: ../lib/puppet/pops/time/timestamp.rb:131
+#: ../lib/puppet/pops/time/timestamp.rb:143
 msgid "%{klass} cannot be subtracted from a Timestamp"
 msgstr ""
 
@@ -4871,6 +4911,26 @@ msgstr ""
 msgid "The given string in encoding '%{enc}' is invalid. Cannot create a Binary UTF-8 representation"
 msgstr ""
 
+#: ../lib/puppet/pops/types/p_init_type.rb:26
+msgid "Init cannot be parameterized with an undefined type and additional arguments"
+msgstr ""
+
+#: ../lib/puppet/pops/types/p_init_type.rb:157
+msgid "Creation of new instance of type '%{type_name}' is not supported"
+msgstr ""
+
+#: ../lib/puppet/pops/types/p_init_type.rb:184
+msgid "The type '%{type}' does not represent a valid set of parameters for %{subject}.new()"
+msgstr ""
+
+#: ../lib/puppet/pops/types/tree_iterators.rb:38
+msgid "Only Array, Hash, and Object types can be used as container types. Got %{type}"
+msgstr ""
+
+#: ../lib/puppet/pops/types/tree_iterators.rb:45
+msgid "Options 'include_containers' and 'include_values' cannot both be false"
+msgstr ""
+
 #: ../lib/puppet/property/ensure.rb:53
 msgid "created"
 msgstr ""
@@ -5247,7 +5307,7 @@ msgstr ""
 msgid "No responsefile specified or non existent, not preseeding anything"
 msgstr ""
 
-#: ../lib/puppet/provider/package/aptitude.rb:21 ../lib/puppet/provider/package/ports.rb:20 ../lib/puppet/provider/package/portupgrade.rb:93 ../lib/puppet/provider/package/portupgrade.rb:151 ../lib/puppet/provider/package/rug.rb:28 ../lib/puppet/provider/package/up2date.rb:17 ../lib/puppet/provider/package/yum.rb:205 ../lib/puppet/provider/package/zypper.rb:109
+#: ../lib/puppet/provider/package/aptitude.rb:21 ../lib/puppet/provider/package/ports.rb:20 ../lib/puppet/provider/package/portupgrade.rb:93 ../lib/puppet/provider/package/portupgrade.rb:151 ../lib/puppet/provider/package/rug.rb:28 ../lib/puppet/provider/package/up2date.rb:17 ../lib/puppet/provider/package/yum.rb:213 ../lib/puppet/provider/package/zypper.rb:109
 msgid "Could not find package %{name}"
 msgstr ""
 
@@ -5287,27 +5347,27 @@ msgstr ""
 msgid "source is defined but does not have trailing slash, ignoring %{source}"
 msgstr ""
 
-#: ../lib/puppet/provider/package/gem.rb:40
+#: ../lib/puppet/provider/package/gem.rb:42
 msgid "Could not list gems: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/provider/package/gem.rb:66
+#: ../lib/puppet/provider/package/gem.rb:68
 msgid "Could not match %{desc}"
 msgstr ""
 
-#: ../lib/puppet/provider/package/gem.rb:106
+#: ../lib/puppet/provider/package/gem.rb:109
 msgid "Invalid source '%{uri}': %{detail}"
 msgstr ""
 
-#: ../lib/puppet/provider/package/gem.rb:117
+#: ../lib/puppet/provider/package/gem.rb:120
 msgid "puppet:// URLs are not supported as gem sources"
 msgstr ""
 
-#: ../lib/puppet/provider/package/gem.rb:135
+#: ../lib/puppet/provider/package/gem.rb:136
 msgid "Could not install: %{output}"
 msgstr ""
 
-#: ../lib/puppet/provider/package/gem.rb:160
+#: ../lib/puppet/provider/package/gem.rb:161
 msgid "Could not uninstall: %{output}"
 msgstr ""
 
@@ -5568,11 +5628,15 @@ msgstr ""
 msgid "Could not check for updates, '%{cmd} check-update' exited with %{status}"
 msgstr ""
 
-#: ../lib/puppet/provider/package/yum.rb:199
+#: ../lib/puppet/provider/package/yum.rb:116
+msgid "Failed to parse package name and architecture from '%{pkgname}'"
+msgstr ""
+
+#: ../lib/puppet/provider/package/yum.rb:207
 msgid "Could not find package %{wanted}"
 msgstr ""
 
-#: ../lib/puppet/provider/package/yum.rb:210
+#: ../lib/puppet/provider/package/yum.rb:218
 msgid "Failed to update to version %{should}, got version %{version} instead"
 msgstr ""
 
@@ -5666,7 +5730,7 @@ msgstr ""
 msgid "No set of title patterns matched the title \"%{title}\"."
 msgstr ""
 
-#: ../lib/puppet/resource/capability_finder.rb:77
+#: ../lib/puppet/resource/capability_finder.rb:75
 msgid "Looking up capability %{cap} in PuppetDB: %{query_terms}"
 msgstr ""
 
@@ -6491,29 +6555,29 @@ msgstr ""
 msgid "Could not find filebucket %{backup} specified in backup"
 msgstr ""
 
-#: ../lib/puppet/type/file.rb:740
-msgid "Could not back up files of type %{current_type}"
+#: ../lib/puppet/type/file.rb:745
+msgid "Could not remove files of type %{current_type}"
 msgstr ""
 
-#: ../lib/puppet/type/file.rb:750
+#: ../lib/puppet/type/file.rb:755
 msgid "Copying owner/mode/group from the source file on Windows is not supported; use source_permissions => ignore."
 msgstr ""
 
 #. TRANSLATORS "stat" is a program name and should not be translated
-#: ../lib/puppet/type/file.rb:831 ../lib/puppet/type/tidy.rb:332
+#: ../lib/puppet/type/file.rb:836 ../lib/puppet/type/tidy.rb:332
 msgid "Could not stat; permission denied"
 msgstr ""
 
-#: ../lib/puppet/type/file.rb:953
+#: ../lib/puppet/type/file.rb:961
 msgid "Not removing directory; use 'force' to override"
 msgstr ""
 
 #. TRANSLATORS refers to a file which could not be backed up
-#: ../lib/puppet/type/file.rb:978
-msgid "Could not back up; will not replace"
+#: ../lib/puppet/type/file.rb:986
+msgid "Could not back up; will not remove"
 msgstr ""
 
-#: ../lib/puppet/type/file.rb:992
+#: ../lib/puppet/type/file.rb:1000
 msgid "File written to disk did not match checksum; discarding changes (%{content_checksum} vs %{newsum})"
 msgstr ""
 
@@ -7210,19 +7274,19 @@ msgstr ""
 msgid "%{klass} failed with error %{error_type}: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/util/execution.rb:231
+#: ../lib/puppet/util/execution.rb:276
 msgid "Could not get output"
 msgstr ""
 
-#: ../lib/puppet/util/execution.rb:235
+#: ../lib/puppet/util/execution.rb:285
 msgid "Execution of '%{str}' returned %{exit_status}: %{output}"
 msgstr ""
 
-#: ../lib/puppet/util/execution.rb:304
+#: ../lib/puppet/util/execution.rb:357
 msgid "Could not execute posix command: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/util/execution.rb:352
+#: ../lib/puppet/util/execution.rb:405
 msgid "Waiting for output; will sleep %{time_to_sleep} seconds"
 msgstr ""
 
@@ -7653,11 +7717,11 @@ msgstr ""
 msgid "No such user %{user}"
 msgstr ""
 
-#: ../lib/puppet/util/suidmanager.rb:145
+#: ../lib/puppet/util/suidmanager.rb:146
 msgid "Invalid id type %{type}"
 msgstr ""
 
-#: ../lib/puppet/util/suidmanager.rb:148
+#: ../lib/puppet/util/suidmanager.rb:149
 msgid "Invalid %{klass}: %{id}"
 msgstr ""