puppet 6.10.1 → 6.11.0

data/lib/puppet/util/logging.rb

@@ -194,9 +194,9 @@ module Logging
     # let's find the offending line;  we need to jump back up the stack a few steps to find the method that called
     #  the deprecated method
     if Puppet[:trace]
-      caller()[2..-1]
+      caller(3)
     else
-      [caller()[2]]
+      [caller(3, 1).first]
     end
   end
 

data/lib/puppet/util/metric.rb

@@ -55,11 +55,11 @@ class Puppet::Util::Metric
   end
 
   def values
-    @values.sort { |a, b| a[1] <=> b[1] }
+    @values.sort_by { |a| a[1] }
   end
 
   # Convert a name into a label.
   def self.labelize(name)
-    name.to_s.capitalize.gsub("_", " ")
+    name.to_s.capitalize.tr("_", " ")
   end
 end

data/lib/puppet/util/platform.rb

@@ -1,8 +1,8 @@
 module Puppet
   module Util
     module Platform
-
       FIPS_STATUS_FILE = "/proc/sys/crypto/fips_enabled".freeze
+      WINDOWS_FIPS_REGISTRY_KEY = 'System\\CurrentControlSet\\Control\\Lsa\\FipsAlgorithmPolicy'.freeze
 
       def windows?
         # Ruby only sets File::ALT_SEPARATOR on Windows and the Ruby standard
@@ -21,9 +21,20 @@ module Puppet
       end
       module_function :default_paths
 
-      @fips_enabled = !windows? &&
-                       File.exist?(FIPS_STATUS_FILE) &&  
-                       File.read(FIPS_STATUS_FILE, 1) == '1'
+      @fips_enabled = if windows?
+                        require 'win32/registry'
+
+                        begin
+                          Win32::Registry::HKEY_LOCAL_MACHINE.open(WINDOWS_FIPS_REGISTRY_KEY) do |reg|
+                            reg.values.first == 1
+                          end
+                        rescue Win32::Registry::Error
+                          false
+                        end
+                      else
+                        File.exist?(FIPS_STATUS_FILE) &&
+                          File.read(FIPS_STATUS_FILE, 1) == '1'
+                      end
 
       def fips_enabled?
         @fips_enabled

data/lib/puppet/util/provider_features.rb

@@ -78,7 +78,7 @@ module Puppet::Util::ProviderFeatures
     str = ""
     @features ||= {}
     return nil if @features.empty?
-    names = @features.keys.sort { |a,b| a.to_s <=> b.to_s }
+    names = @features.keys.sort_by(&:to_s)
     names.each do |name|
       doc = @features[name].docs.gsub(/\n\s+/, " ")
       str << "- *#{name}*: #{doc}\n"
@@ -127,9 +127,7 @@ module Puppet::Util::ProviderFeatures
       # Create a method that will list all functional features.
       @feature_module.send(:define_method, :features) do
         return false unless defined?(features)
-        features.keys.find_all { |n| feature?(n) }.sort { |a,b|
-          a.to_s <=> b.to_s
-        }
+        features.keys.find_all { |n| feature?(n) }.sort_by(&:to_s)
       end
 
       # Create a method that will determine if a provided list of

data/lib/puppet/util/rdoc.rb

@@ -31,7 +31,7 @@ module Puppet::Util::RDoc
     # uses relative_path_from that will generate errors when the slashes don't
     # properly match.  This is a workaround for that issue.
     if Puppet::Util::Platform.windows? && RDoc::VERSION !~ /^[0-3]\./
-      options += [ "--root", Dir.pwd.gsub(/\\/, '/')]
+      options += [ "--root", Dir.pwd.tr('\\', '/')]
     end
     options += files
 

data/lib/puppet/util/reference.rb

@@ -58,7 +58,7 @@ class Puppet::Util::Reference
 
   def self.references(environment)
     instance_loader(:reference).loadall(environment)
-    loaded_instances(:reference).sort { |a,b| a.to_s <=> b.to_s }
+    loaded_instances(:reference).sort_by(&:to_s)
   end
 
   attr_accessor :page, :depth, :header, :title, :dynamic

data/lib/puppet/util/resource_template.rb

@@ -53,7 +53,7 @@ class Puppet::Util::ResourceTemplate
 
   def set_resource_variables
     @resource.to_hash.each do |param, value|
-      var = "@#{param.to_s}"
+      var = "@#{param}"
       instance_variable_set(var, value)
     end
   end

data/lib/puppet/util/selinux.rb

@@ -206,7 +206,9 @@ module Puppet::Util::SELinux
         # If possible we use read_nonblock in a loop rather than read to work-
         # a linux kernel bug.  See ticket #1963 for details.
         mountfh = File.open("/proc/mounts")
-        mounts += mountfh.read_nonblock(1024) while true
+        loop do
+          mounts += mountfh.read_nonblock(1024)
+        end
       else
         # Otherwise we shell out and let cat do it for us
         mountfh = IO.popen("/bin/cat /proc/mounts")

data/lib/puppet/util/windows/registry.rb

@@ -46,11 +46,12 @@ module Puppet::Util::Windows
 
       subkey_max_len, _ = reg_query_info_key_max_lengths(key)
 
-      begin
+      loop do
         subkey, filetime = reg_enum_key(key, index, subkey_max_len)
         yield subkey, filetime if !subkey.nil?
         index += 1
-      end while !subkey.nil?
+        break if subkey.nil?
+      end
 
       index
     end
@@ -93,11 +94,12 @@ module Puppet::Util::Windows
 
       _, value_max_len = reg_query_info_key_max_lengths(key)
 
-      begin
+      loop do
         subkey, type, data = reg_enum_value(key, index, value_max_len)
         yield subkey, type, data if !subkey.nil?
         index += 1
-      end while !subkey.nil?
+        break if subkey.nil?
+      end
 
       index
     end
@@ -314,7 +316,7 @@ module Puppet::Util::Windows
 
     def sanitize(value)
       # Replace null bytes with a space
-      value.gsub!("\x00", ' ')
+      value.tr!("\x00", ' ')
       value
     end
 

data/lib/puppet/vendor.rb

@@ -45,7 +45,7 @@ module Puppet
       #
       def load_vendored
         Dir.entries(vendor_dir).each do |entry|
-          if entry.match(/load_(\w+?)\.rb$/)
+          if entry =~ /load_(\w+?)\.rb$/
             load_entry entry
           end
         end

data/lib/puppet/vendor/require_vendored.rb

@@ -3,4 +3,3 @@
 
 # The vendored library 'rgen' is loaded on demand.
 # The vendored library 'pathspec' is loaded on demand.
-# The vendored library 'deep_merge' is loaded on demand.

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 = '6.10.1'
+  PUPPETVERSION = '6.11.0'
 
   ##
   # version is a public API method intended to always provide a fast and

data/lib/puppet/x509/cert_provider.rb

@@ -342,7 +342,10 @@ class Puppet::X509::CertProvider
   def permissions_for_setting(name)
     setting = Puppet.settings.setting(name)
     perm = { mode: setting.mode.to_i(8) }
-    perm.merge!(owner: setting.owner, group: setting.group) if Puppet.features.root? && !Puppet::Util::Platform.windows?
+    if Puppet.features.root? && !Puppet::Util::Platform.windows?
+      perm[:owner] = setting.owner
+      perm[:group] = setting.group
+    end
     perm
   end
 end

data/locales/puppet.pot

@@ -6,11 +6,11 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Puppet automation framework 6.10.0-16-gc7a8e5e\n"
+"Project-Id-Version: Puppet automation framework 6.10.1-308-g9fd2251\n"
 "\n"
 "Report-Msgid-Bugs-To: https://tickets.puppetlabs.com\n"
-"POT-Creation-Date: 2019-09-30 23:18+0000\n"
-"PO-Revision-Date: 2019-09-30 23:18+0000\n"
+"POT-Creation-Date: 2019-11-14 01:31+0000\n"
+"PO-Revision-Date: 2019-11-14 01:31+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
@@ -44,7 +44,7 @@ msgstr ""
 msgid "Please supply a parameter to perform a Hiera lookup"
 msgstr ""
 
-#: ../lib/hiera_puppet.rb:75 ../lib/puppet/indirector/hiera.rb:79
+#: ../lib/hiera_puppet.rb:75 ../lib/puppet/indirector/hiera.rb:81
 msgid "Config file %{hiera_config} not found, using Hiera defaults"
 msgstr ""
 
@@ -174,7 +174,7 @@ msgstr ""
 msgid "No help available for puppet %{app_name}"
 msgstr ""
 
-#: ../lib/puppet/application/agent.rb:24 ../lib/puppet/application/device.rb:23
+#: ../lib/puppet/application/agent.rb:24 ../lib/puppet/application/device.rb:24
 msgid "Cancelling startup"
 msgstr ""
 
@@ -182,19 +182,19 @@ msgstr ""
 msgid "The puppet agent daemon"
 msgstr ""
 
-#: ../lib/puppet/application/agent.rb:396
+#: ../lib/puppet/application/agent.rb:399
 msgid "Fingerprint asked but neither the certificate, nor the certificate request have been issued"
 msgstr ""
 
-#: ../lib/puppet/application/agent.rb:401
+#: ../lib/puppet/application/agent.rb:404
 msgid "Failed to generate fingerprint: %{message}"
 msgstr ""
 
-#: ../lib/puppet/application/agent.rb:424
+#: ../lib/puppet/application/agent.rb:427
 msgid "Starting Puppet client version %{version}"
 msgstr ""
 
-#: ../lib/puppet/application/agent.rb:440
+#: ../lib/puppet/application/agent.rb:443
 msgid "The puppet agent command does not take parameters"
 msgstr ""
 
@@ -240,55 +240,55 @@ msgstr ""
 msgid "Manage certificates and requests (Disabled)"
 msgstr ""
 
-#: ../lib/puppet/application/describe.rb:181
+#: ../lib/puppet/application/describe.rb:175
 msgid "Display help about resource types"
 msgstr ""
 
-#: ../lib/puppet/application/device.rb:82
+#: ../lib/puppet/application/device.rb:83
 msgid "Manage remote network devices"
 msgstr ""
 
-#: ../lib/puppet/application/device.rb:229
+#: ../lib/puppet/application/device.rb:230
 msgid "resource command requires target"
 msgstr ""
 
-#: ../lib/puppet/application/device.rb:232
+#: ../lib/puppet/application/device.rb:233
 msgid "facts command requires target"
 msgstr ""
 
-#: ../lib/puppet/application/device.rb:235
+#: ../lib/puppet/application/device.rb:236
 msgid "missing argument: --target is required when using --apply"
 msgstr ""
 
-#: ../lib/puppet/application/device.rb:236
+#: ../lib/puppet/application/device.rb:237
 msgid "%{file} does not exist, cannot apply"
 msgstr ""
 
-#: ../lib/puppet/application/device.rb:254
+#: ../lib/puppet/application/device.rb:255
 msgid "Target device / certificate '%{target}' not found in %{config}"
 msgstr ""
 
-#: ../lib/puppet/application/device.rb:256
+#: ../lib/puppet/application/device.rb:257
 msgid "No device found in %{config}"
 msgstr ""
 
-#: ../lib/puppet/application/device.rb:315
+#: ../lib/puppet/application/device.rb:316
 msgid "retrieving resource: %{resource} from %{target} at %{scheme}%{url_host}%{port}%{url_path}"
 msgstr ""
 
-#: ../lib/puppet/application/device.rb:330
+#: ../lib/puppet/application/device.rb:331
 msgid "retrieving facts from %{target} at %{scheme}%{url_host}%{port}%{url_path}"
 msgstr ""
 
-#: ../lib/puppet/application/device.rb:353
+#: ../lib/puppet/application/device.rb:354
 msgid "starting applying configuration to %{target} at %{scheme}%{url_host}%{port}%{url_path}"
 msgstr ""
 
-#: ../lib/puppet/application/device.rb:391 ../lib/puppet/application/resource.rb:196
+#: ../lib/puppet/application/device.rb:392 ../lib/puppet/application/resource.rb:196
 msgid "You must specify the type to display"
 msgstr ""
 
-#: ../lib/puppet/application/device.rb:392 ../lib/puppet/application/resource.rb:197
+#: ../lib/puppet/application/device.rb:393 ../lib/puppet/application/resource.rb:197
 msgid "Could not find type %{type}"
 msgstr ""
 
@@ -459,59 +459,59 @@ msgstr ""
 msgid "Manage SSL keys and certificates for puppet SSL clients"
 msgstr ""
 
-#: ../lib/puppet/application/ssl.rb:102
+#: ../lib/puppet/application/ssl.rb:103
 msgid "An action must be specified."
 msgstr ""
 
-#: ../lib/puppet/application/ssl.rb:125 ../lib/puppet/application/ssl.rb:132
+#: ../lib/puppet/application/ssl.rb:126 ../lib/puppet/application/ssl.rb:133
 msgid "The certificate for '%{name}' has not yet been signed"
 msgstr ""
 
-#: ../lib/puppet/application/ssl.rb:143
+#: ../lib/puppet/application/ssl.rb:144
 msgid "Completed SSL initialization"
 msgstr ""
 
-#: ../lib/puppet/application/ssl.rb:145
+#: ../lib/puppet/application/ssl.rb:146
 msgid "Unknown action '%{action}'"
 msgstr ""
 
-#: ../lib/puppet/application/ssl.rb:153 ../lib/puppet/ssl/state_machine.rb:178
+#: ../lib/puppet/application/ssl.rb:154 ../lib/puppet/ssl/state_machine.rb:180
 msgid "Creating a new EC SSL key for %{name} using curve %{curve}"
 msgstr ""
 
-#: ../lib/puppet/application/ssl.rb:156 ../lib/puppet/ssl/key.rb:26
+#: ../lib/puppet/application/ssl.rb:157 ../lib/puppet/ssl/key.rb:26
 msgid "Creating a new SSL key for %{name}"
 msgstr ""
 
-#: ../lib/puppet/application/ssl.rb:165
-msgid "Submitted certificate request for '%{name}' to https://%{server}:%{port}"
+#: ../lib/puppet/application/ssl.rb:167
+msgid "Submitted certificate request for '%{name}' to %{url}"
 msgstr ""
 
 #: ../lib/puppet/application/ssl.rb:170
-msgid "Could not submit certificate request for '%{name}' to https://%{server}:%{port} due to a conflict on the server"
+msgid "Could not submit certificate request for '%{name}' to %{url} due to a conflict on the server"
 msgstr ""
 
 #: ../lib/puppet/application/ssl.rb:172 ../lib/puppet/application/ssl.rb:175
 msgid "Failed to submit certificate request: %{message}"
 msgstr ""
 
-#: ../lib/puppet/application/ssl.rb:181
-msgid "Downloading certificate '%{name}' from https://%{server}:%{port}"
+#: ../lib/puppet/application/ssl.rb:183
+msgid "Downloading certificate '%{name}' from %{url}"
 msgstr ""
 
-#: ../lib/puppet/application/ssl.rb:188 ../lib/puppet/application/ssl.rb:196
+#: ../lib/puppet/application/ssl.rb:187
 msgid "Downloaded certificate '%{name}' with fingerprint %{fingerprint}"
 msgstr ""
 
-#: ../lib/puppet/application/ssl.rb:204 ../lib/puppet/application/ssl.rb:207
+#: ../lib/puppet/application/ssl.rb:200 ../lib/puppet/application/ssl.rb:203
 msgid "Failed to download certificate: %{message}"
 msgstr ""
 
-#: ../lib/puppet/application/ssl.rb:235 ../lib/puppet/application/ssl.rb:238
+#: ../lib/puppet/application/ssl.rb:232 ../lib/puppet/application/ssl.rb:235
 msgid "Failed to connect to the CA to determine if certificate %{certname} has been cleaned"
 msgstr ""
 
-#: ../lib/puppet/application/ssl.rb:242
+#: ../lib/puppet/application/ssl.rb:239
 msgid ""
 "The certificate %{certname} must be cleaned from the CA first. To fix this,\n"
 "run the following commands on the CA:\n"
@@ -600,32 +600,40 @@ msgstr ""
 msgid "Failed to apply catalog: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:409
+#: ../lib/puppet/configurer.rb:417
 msgid "Puppet server %{host}:%{port} is unavailable: %{code} %{reason}"
 msgstr ""
 
 #. TRANSLATORS 'server_list' is the name of a setting and should not be translated
-#: ../lib/puppet/configurer.rb:413
+#: ../lib/puppet/configurer.rb:421
 msgid "Unable to connect to server from server_list setting: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:425 ../lib/puppet/face/report.rb:47
+#: ../lib/puppet/configurer.rb:433 ../lib/puppet/face/report.rb:47
 msgid "Could not send report: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:434
+#: ../lib/puppet/configurer.rb:442
 msgid "Could not save last run local report: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:446
+#: ../lib/puppet/configurer.rb:462
+msgid "Uploading facts for %{node} to %{server}"
+msgstr ""
+
+#: ../lib/puppet/configurer.rb:473
+msgid "Failed to submit facts: %{detail}"
+msgstr ""
+
+#: ../lib/puppet/configurer.rb:488
 msgid "Could not run command from %{setting}: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:464
+#: ../lib/puppet/configurer.rb:506
 msgid "Could not retrieve catalog from cache: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:484
+#: ../lib/puppet/configurer.rb:526
 msgid "Could not retrieve catalog from remote server: %{detail}"
 msgstr ""
 
@@ -657,10 +665,14 @@ msgstr ""
 msgid "Attempted to pop, but already at root of the context stack."
 msgstr ""
 
-#: ../lib/puppet/context/trusted_information.rb:48
+#: ../lib/puppet/context/trusted_information.rb:58
 msgid "TrustedInformation expected a certificate, but none was given."
 msgstr ""
 
+#: ../lib/puppet/context/trusted_information.rb:98 ../lib/puppet/parser/scope.rb:835
+msgid "Unsupported data type: '%{klass}'"
+msgstr ""
+
 #: ../lib/puppet/daemon.rb:83
 msgid "Cannot reexec unless ARGV arguments are set"
 msgstr ""
@@ -694,29 +706,29 @@ msgid "Valid values are %{values}."
 msgstr ""
 
 #. TRANSLATORS 'data_binding_terminus' is a setting and should not be translated
-#: ../lib/puppet/defaults.rb:495
+#: ../lib/puppet/defaults.rb:494
 msgid "Setting 'data_binding_terminus' is deprecated."
 msgstr ""
 
 #. TRANSLATORS 'hiera' should not be translated
-#: ../lib/puppet/defaults.rb:497
+#: ../lib/puppet/defaults.rb:496
 msgid "Convert custom terminus to hiera 5 API."
 msgstr ""
 
 #. TRANSLATORS 'environment_data_provider' is a setting and should not be translated
-#: ../lib/puppet/defaults.rb:676
+#: ../lib/puppet/defaults.rb:686
 msgid "Setting 'environment_data_provider' is deprecated."
 msgstr ""
 
-#: ../lib/puppet/defaults.rb:757
+#: ../lib/puppet/defaults.rb:767
 msgid "Certificate names must be lower case"
 msgstr ""
 
-#: ../lib/puppet/defaults.rb:938
+#: ../lib/puppet/defaults.rb:948
 msgid "Setting 'ssl_client_ca_auth' is deprecated."
 msgstr ""
 
-#: ../lib/puppet/defaults.rb:1017 ../lib/puppet/settings/enum_setting.rb:13 ../lib/puppet/settings/symbolic_enum_setting.rb:14
+#: ../lib/puppet/defaults.rb:1027 ../lib/puppet/settings/enum_setting.rb:13 ../lib/puppet/settings/symbolic_enum_setting.rb:14
 msgid "Invalid value '%{value}' for parameter %{name}. Allowed values are '%{allowed_values}'"
 msgstr ""
 
@@ -1970,13 +1982,13 @@ msgid ""
 "Parsing of type string '\"%{type_string}\"' failed with message: <%{message}>.\n"
 msgstr ""
 
-#: ../lib/puppet/functions.rb:635
+#: ../lib/puppet/functions.rb:634
 msgid ""
 "Parsing of 'type \"%{assignment_string}\"' failed with message: <%{message}>.\n"
 "Called from <%{ruby_file_location}>"
 msgstr ""
 
-#: ../lib/puppet/functions.rb:644
+#: ../lib/puppet/functions.rb:643
 msgid ""
 "Expected a type alias assignment on the form 'AliasType = T', got '%{assignment_string}'.\n"
 "Called from <%{ruby_file_location}>"
@@ -2188,11 +2200,11 @@ msgid "Got an event from invalid vertex %{source}"
 msgstr ""
 
 #. TRANSLATORS "negative or zero" refers to the count of paths
-#: ../lib/puppet/graph/simple_graph.rb:199
+#: ../lib/puppet/graph/simple_graph.rb:200
 msgid "negative or zero max_paths"
 msgstr ""
 
-#: ../lib/puppet/graph/simple_graph.rb:231
+#: ../lib/puppet/graph/simple_graph.rb:232
 msgid ""
 "Found %{num} dependency cycle:\n"
 msgid_plural ""
@@ -2200,15 +2212,55 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../lib/puppet/graph/simple_graph.rb:240
+#: ../lib/puppet/graph/simple_graph.rb:241
 msgid "Cycle graph written to %{filename}."
 msgstr ""
 
 #. TRANSLATORS '--graph' refers to a command line option and OmniGraffle and GraphViz are program names and should not be translated
-#: ../lib/puppet/graph/simple_graph.rb:243
+#: ../lib/puppet/graph/simple_graph.rb:244
 msgid "Try the '--graph' option and opening the resulting '.dot' file in OmniGraffle or GraphViz"
 msgstr ""
 
+#: ../lib/puppet/http/client.rb:31
+msgid "Failed to connect to %{uri}: %{message}"
+msgstr ""
+
+#: ../lib/puppet/http/client.rb:96
+msgid "Sleeping for %{interval} seconds before retrying the request"
+msgstr ""
+
+#: ../lib/puppet/http/client.rb:125
+msgid "Request to %{uri} interrupted after %{elapsed} seconds"
+msgstr ""
+
+#: ../lib/puppet/http/client.rb:127
+msgid "Request to %{uri} timed out after %{elapsed} seconds"
+msgstr ""
+
+#: ../lib/puppet/http/client.rb:129
+msgid "Request to %{uri} failed after %{elapsed} seconds: %{message}"
+msgstr ""
+
+#: ../lib/puppet/http/errors.rb:21
+msgid "Too many HTTP redirections for %{addr}"
+msgstr ""
+
+#: ../lib/puppet/http/errors.rb:27
+msgid "Too many HTTP retries for %{addr}"
+msgstr ""
+
+#: ../lib/puppet/http/redirector.rb:42
+msgid "Location response header is missing"
+msgstr ""
+
+#: ../lib/puppet/http/redirector.rb:46
+msgid "Location URI is invalid: %{detail}"
+msgstr ""
+
+#: ../lib/puppet/http/retry_after_handler.rb:44
+msgid "Failed to parse Retry-After header '%{retry_after}' as an integer or RFC 2822 date"
+msgstr ""
+
 #: ../lib/puppet/indirector.rb:25
 msgid "Indirection %{indirection_name} does not exist"
 msgstr ""
@@ -2716,7 +2768,7 @@ msgstr ""
 msgid "Could not understand URL %{key}: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/indirector/resource/ral.rb:61
+#: ../lib/puppet/indirector/resource/ral.rb:59
 msgid "Could not find type %{request_type}"
 msgstr ""
 
@@ -2737,7 +2789,7 @@ msgstr ""
 msgid "Downgrading to PSON for future requests"
 msgstr ""
 
-#: ../lib/puppet/indirector/rest.rb:265 ../lib/puppet/rest/response.rb:30
+#: ../lib/puppet/indirector/rest.rb:265 ../lib/puppet/rest/response.rb:31
 msgid "Error %{code} on SERVER: %{returned_message}"
 msgstr ""
 
@@ -3131,7 +3183,7 @@ msgstr ""
 msgid "Plan name cannot be a Puppet data type, but was '%{name}'"
 msgstr ""
 
-#: ../lib/puppet/module/task.rb:24 ../lib/puppet/module/task.rb:203
+#: ../lib/puppet/module/task.rb:24 ../lib/puppet/module/task.rb:219
 msgid "Task names must start with a lowercase letter and be composed of only lowercase letters, numbers, and underscores"
 msgstr ""
 
@@ -3139,47 +3191,55 @@ msgstr ""
 msgid "Task %{task_name} not found in module %{module_name}."
 msgstr ""
 
-#: ../lib/puppet/module/task.rb:91
+#: ../lib/puppet/module/task.rb:82 ../lib/puppet/module/task.rb:88
+msgid "The 'files' task metadata expects an array, got %{files}."
+msgstr ""
+
+#: ../lib/puppet/module/task.rb:103
 msgid "Could not find module %{module_name} containing task file %{filename}"
 msgstr ""
 
-#: ../lib/puppet/module/task.rb:97
+#: ../lib/puppet/module/task.rb:109
 msgid "Files must be saved in module directories that Puppet makes available via mount points: %{mounts}"
 msgstr ""
 
-#: ../lib/puppet/module/task.rb:104
+#: ../lib/puppet/module/task.rb:116
 msgid "File pathnames cannot include relative paths"
 msgstr ""
 
-#: ../lib/puppet/module/task.rb:109
+#: ../lib/puppet/module/task.rb:121
 msgid "Could not find %{path} on disk"
 msgstr ""
 
-#: ../lib/puppet/module/task.rb:116
+#: ../lib/puppet/module/task.rb:128
 msgid "Directories specified in task metadata must include a trailing slash: %{dir}"
 msgstr ""
 
-#: ../lib/puppet/module/task.rb:123
+#: ../lib/puppet/module/task.rb:135
 msgid "Files specified in task metadata cannot include a trailing slash: %{file}"
 msgstr ""
 
-#: ../lib/puppet/module/task.rb:140
+#: ../lib/puppet/module/task.rb:152
 msgid "Task metadata for task %{name} does not specify implementations as an array"
 msgstr ""
 
-#: ../lib/puppet/module/task.rb:147
+#: ../lib/puppet/module/task.rb:158
+msgid "Task metadata for task %{name} does not specify requirements as an array"
+msgstr ""
+
+#: ../lib/puppet/module/task.rb:163
 msgid "Task metadata for task %{name} specifies missing implementation %{implementation}"
 msgstr ""
 
-#: ../lib/puppet/module/task.rb:159
+#: ../lib/puppet/module/task.rb:175
 msgid "No source besides task metadata was found in directory %{directory} for task %{name}"
 msgstr ""
 
-#: ../lib/puppet/module/task.rb:163
+#: ../lib/puppet/module/task.rb:179
 msgid "Multiple executables were found in directory %{directory} for task %{name}; define 'implementations' in metadata to differentiate between them"
 msgstr ""
 
-#: ../lib/puppet/module/task.rb:217
+#: ../lib/puppet/module/task.rb:233
 msgid "Error reading metadata: %{message}"
 msgstr ""
 
@@ -3790,45 +3850,45 @@ msgstr ""
 msgid "No request key specified in %{uri}"
 msgstr ""
 
-#: ../lib/puppet/network/http/api/indirected_routes.rb:129
+#: ../lib/puppet/network/http/api/indirected_routes.rb:140
 msgid "Could not find %{value0} %{key}"
 msgstr ""
 
-#: ../lib/puppet/network/http/api/indirected_routes.rb:136
+#: ../lib/puppet/network/http/api/indirected_routes.rb:147
 msgid "Rendered result in %{format}"
 msgstr ""
 
-#: ../lib/puppet/network/http/api/indirected_routes.rb:142
+#: ../lib/puppet/network/http/api/indirected_routes.rb:153
 msgid "Sent response"
 msgstr ""
 
-#: ../lib/puppet/network/http/api/indirected_routes.rb:150
+#: ../lib/puppet/network/http/api/indirected_routes.rb:161
 msgid "Could not find %{indirection} %{key}"
 msgstr ""
 
-#: ../lib/puppet/network/http/api/indirected_routes.rb:162
+#: ../lib/puppet/network/http/api/indirected_routes.rb:173
 msgid "Could not find instances in %{indirection} with '%{key}'"
 msgstr ""
 
-#: ../lib/puppet/network/http/api/indirected_routes.rb:210 ../lib/puppet/network/http/request.rb:61
+#: ../lib/puppet/network/http/api/indirected_routes.rb:221 ../lib/puppet/network/http/request.rb:61
 msgid "No supported formats are acceptable (Accept: %{accepted_formats})"
 msgstr ""
 
-#: ../lib/puppet/network/http/api/indirected_routes.rb:235
+#: ../lib/puppet/network/http/api/indirected_routes.rb:246
 msgid "The request body is invalid: %{message}"
 msgstr ""
 
 #. TRANSLATORS "mime-type" is a keyword and should not be translated
 #. TRANSLATORS "mime-type" is a keyword and should not be translated
-#: ../lib/puppet/network/http/api/indirected_routes.rb:241 ../lib/puppet/network/http/request.rb:32
+#: ../lib/puppet/network/http/api/indirected_routes.rb:252 ../lib/puppet/network/http/request.rb:32
 msgid "Client sent a mime-type (%{header}) that doesn't correspond to a format we support"
 msgstr ""
 
-#: ../lib/puppet/network/http/api/indirected_routes.rb:247
+#: ../lib/puppet/network/http/api/indirected_routes.rb:258
 msgid "No support for http method %{http_method}"
 msgstr ""
 
-#: ../lib/puppet/network/http/api/indirected_routes.rb:252
+#: ../lib/puppet/network/http/api/indirected_routes.rb:263
 msgid "No support for plurality %{indirection} for %{http_method} operations"
 msgstr ""
 
@@ -3882,15 +3942,15 @@ msgstr ""
 msgid "Received a %{status_code} response from %{server_hostname}. Sleeping for %{retry_sleep} seconds before retrying the request."
 msgstr ""
 
-#: ../lib/puppet/network/http/connection.rb:332
+#: ../lib/puppet/network/http/connection.rb:331
 msgid "request %{uri} interrupted after %{elapsed} seconds"
 msgstr ""
 
-#: ../lib/puppet/network/http/connection.rb:334
+#: ../lib/puppet/network/http/connection.rb:333
 msgid "request %{uri} timed out after %{elapsed} seconds"
 msgstr ""
 
-#: ../lib/puppet/network/http/connection.rb:336
+#: ../lib/puppet/network/http/connection.rb:335
 msgid "request %{uri} failed: %{msg}"
 msgstr ""
 
@@ -4016,7 +4076,7 @@ msgstr ""
 msgid "The 'disable_per_environment_manifest' setting is true, and the '%{env_name}' environment has an environment.conf manifest that conflicts with the 'default_manifest' setting."
 msgstr ""
 
-#: ../lib/puppet/node/environment.rb:543 ../lib/puppet/pops/loaders.rb:298
+#: ../lib/puppet/node/environment.rb:545 ../lib/puppet/pops/loaders.rb:298
 msgid "Could not parse for environment %{env}: %{detail}"
 msgstr ""
 
@@ -4610,79 +4670,75 @@ msgstr ""
 msgid "class %{classname} has not been evaluated"
 msgstr ""
 
-#: ../lib/puppet/parser/scope.rb:702
+#: ../lib/puppet/parser/scope.rb:703
 msgid "Default already defined for %{type} { %{param} }; cannot redefine"
 msgstr ""
 
-#: ../lib/puppet/parser/scope.rb:762
+#: ../lib/puppet/parser/scope.rb:763
 msgid "Cannot assign to a numeric match result variable '$%{name}'"
 msgstr ""
 
-#: ../lib/puppet/parser/scope.rb:765
+#: ../lib/puppet/parser/scope.rb:766
 msgid "Scope variable name %{name} is a %{class_type}, not a string"
 msgstr ""
 
-#: ../lib/puppet/parser/scope.rb:770 ../lib/puppet/parser/scope.rb:775
+#: ../lib/puppet/parser/scope.rb:771 ../lib/puppet/parser/scope.rb:776
 msgid "Attempt to assign to a reserved variable name: '%{name}'"
 msgstr ""
 
-#: ../lib/puppet/parser/scope.rb:780
+#: ../lib/puppet/parser/scope.rb:781
 msgid "Cannot reassign variable '$%{name}'"
 msgstr ""
 
-#: ../lib/puppet/parser/scope.rb:834
-msgid "Unsupported data type: '%{klass}'"
-msgstr ""
-
-#: ../lib/puppet/parser/scope.rb:1011
+#: ../lib/puppet/parser/scope.rb:1012
 msgid "Invalid regex match data. Got a %{klass}"
 msgstr ""
 
-#: ../lib/puppet/parser/scope.rb:1019
+#: ../lib/puppet/parser/scope.rb:1020
 msgid "Scope#find_resource_type() is no longer supported, use Puppet::Pops::Evaluator::Runtime3ResourceSupport instead"
 msgstr ""
 
-#: ../lib/puppet/parser/scope.rb:1024
+#: ../lib/puppet/parser/scope.rb:1025
 msgid "Scope#find_builtin_resource_type() is no longer supported, use Puppet::Pops::Evaluator::Runtime3ResourceSupport instead"
 msgstr ""
 
-#: ../lib/puppet/parser/scope.rb:1029
+#: ../lib/puppet/parser/scope.rb:1030
 msgid "Scope#find_defined_resource_type() is no longer supported, use Puppet::Pops::Evaluator::Runtime3ResourceSupport instead"
 msgstr ""
 
-#: ../lib/puppet/parser/scope.rb:1043
+#: ../lib/puppet/parser/scope.rb:1044
 msgid "Function %{name} not defined despite being loaded!"
 msgstr ""
 
-#: ../lib/puppet/parser/scope.rb:1050
+#: ../lib/puppet/parser/scope.rb:1051
 msgid "Scope#resolve_type_and_title() is no longer supported, use Puppet::Pops::Evaluator::Runtime3ResourceSupport instead"
 msgstr ""
 
-#: ../lib/puppet/parser/scope.rb:1070
+#: ../lib/puppet/parser/scope.rb:1071
 msgid "Cannot use undef as a class name"
 msgstr ""
 
-#: ../lib/puppet/parser/scope.rb:1072
+#: ../lib/puppet/parser/scope.rb:1073
 msgid "Cannot use empty string as a class name"
 msgstr ""
 
 #. TRANSLATORS "Class" and "Type" are Puppet keywords and should not be translated
-#: ../lib/puppet/parser/scope.rb:1081
+#: ../lib/puppet/parser/scope.rb:1082
 msgid "Cannot use an unspecific Class[] Type"
 msgstr ""
 
 #. TRANSLATORS "Resource" is a class name and should not be translated
-#: ../lib/puppet/parser/scope.rb:1108
+#: ../lib/puppet/parser/scope.rb:1109
 msgid "Cannot use an unspecific Resource[] where a Resource['class', name] is expected"
 msgstr ""
 
 #. TRANSLATORS "Resource" is a class name and should not be translated
-#: ../lib/puppet/parser/scope.rb:1112
+#: ../lib/puppet/parser/scope.rb:1113
 msgid "Cannot use a Resource[%{type_name}] where a Resource['class', name] is expected"
 msgstr ""
 
 #. TRANSLATORS "Resource" is a class name and should not be translated
-#: ../lib/puppet/parser/scope.rb:1116
+#: ../lib/puppet/parser/scope.rb:1117
 msgid "Cannot use an unspecific Resource['class'] where a Resource['class', name] is expected"
 msgstr ""
 
@@ -4832,7 +4888,7 @@ msgstr ""
 msgid "Can only delete from an Array or Hash."
 msgstr ""
 
-#: ../lib/puppet/pops/evaluator/external_syntax_support.rb:22 ../lib/puppet/pops/evaluator/runtime3_support.rb:23 ../lib/puppet/pops/evaluator/runtime3_support.rb:529
+#: ../lib/puppet/pops/evaluator/external_syntax_support.rb:22 ../lib/puppet/pops/evaluator/runtime3_support.rb:23 ../lib/puppet/pops/evaluator/runtime3_support.rb:526
 msgid "Internal Error: Configuration of runtime error handling wrong: should have raised exception"
 msgstr ""
 
@@ -5739,7 +5795,11 @@ msgstr ""
 msgid "Illegal method definition of method '%{method_name}' on line %{line}' in legacy function. See %{url} for more information"
 msgstr ""
 
-#: ../lib/puppet/pops/loader/task_instantiator.rb:27
+#: ../lib/puppet/pops/loader/task_instantiator.rb:22
+msgid "Failed to load metadata for task %{name}: 'parameters' must be a hash"
+msgstr ""
+
+#: ../lib/puppet/pops/loader/task_instantiator.rb:31
 msgid "Failed to load metadata for task %{name}: %{reason}"
 msgstr ""
 
@@ -5810,11 +5870,11 @@ msgstr ""
 msgid "Hiera configuration recreated due to change of scope variables used in interpolation expressions"
 msgstr ""
 
-#: ../lib/puppet/pops/lookup/hiera_config.rb:427
+#: ../lib/puppet/pops/lookup/hiera_config.rb:428
 msgid "%{config_path}: Use of 'hiera.yaml' version 3 is deprecated. It should be converted to version 5"
 msgstr ""
 
-#: ../lib/puppet/pops/lookup/hiera_config.rb:527
+#: ../lib/puppet/pops/lookup/hiera_config.rb:528
 msgid "%{config_path}: Use of 'hiera.yaml' version 4 is deprecated. It should be converted to version 5"
 msgstr ""
 
@@ -5950,39 +6010,39 @@ msgstr ""
 msgid "illegal comma separated argument list"
 msgstr ""
 
-#: ../lib/puppet/pops/parser/pn_parser.rb:64
+#: ../lib/puppet/pops/parser/pn_parser.rb:81
 msgid "unexpected end of input"
 msgstr ""
 
-#: ../lib/puppet/pops/parser/pn_parser.rb:66
+#: ../lib/puppet/pops/parser/pn_parser.rb:83
 msgid "unexpected %{value}"
 msgstr ""
 
-#: ../lib/puppet/pops/parser/pn_parser.rb:103
+#: ../lib/puppet/pops/parser/pn_parser.rb:120
 msgid "map key expected"
 msgstr ""
 
-#: ../lib/puppet/pops/parser/pn_parser.rb:114
+#: ../lib/puppet/pops/parser/pn_parser.rb:131
 msgid "expected identifier to follow '('"
 msgstr ""
 
-#: ../lib/puppet/pops/parser/pn_parser.rb:125
+#: ../lib/puppet/pops/parser/pn_parser.rb:142
 msgid "missing '%{token}' to end list"
 msgstr ""
 
-#: ../lib/puppet/pops/parser/pn_parser.rb:186
+#: ../lib/puppet/pops/parser/pn_parser.rb:187
 msgid "expected identifier after ':'"
 msgstr ""
 
-#: ../lib/puppet/pops/parser/pn_parser.rb:225
+#: ../lib/puppet/pops/parser/pn_parser.rb:226
 msgid "unterminated quote"
 msgstr ""
 
-#: ../lib/puppet/pops/parser/pn_parser.rb:251
+#: ../lib/puppet/pops/parser/pn_parser.rb:252
 msgid "malformed octal quote"
 msgstr ""
 
-#: ../lib/puppet/pops/parser/pn_parser.rb:266 ../lib/puppet/pops/parser/pn_parser.rb:271 ../lib/puppet/pops/parser/pn_parser.rb:275
+#: ../lib/puppet/pops/parser/pn_parser.rb:267 ../lib/puppet/pops/parser/pn_parser.rb:272 ../lib/puppet/pops/parser/pn_parser.rb:276
 msgid "digit expected"
 msgstr ""
 
@@ -6463,8 +6523,8 @@ msgstr ""
 msgid "Empty environment setting '%{var}'"
 msgstr ""
 
-#: ../lib/puppet/provider/exec.rb:99
-msgid "'%{command}' is not qualified and no path was specified. Please qualify the command or specify a path."
+#: ../lib/puppet/provider/exec.rb:103
+msgid "'%{exe}' is not qualified and no path was specified. Please qualify the command or specify a path."
 msgstr ""
 
 #: ../lib/puppet/provider/exec/posix.rb:21 ../lib/puppet/provider/exec/posix.rb:38 ../lib/puppet/provider/exec/windows.rb:40 ../lib/puppet/provider/exec/windows.rb:53
@@ -6635,19 +6695,19 @@ msgstr ""
 msgid "Mac OS X packages must specify a package source"
 msgstr ""
 
-#: ../lib/puppet/provider/package/apt.rb:39
+#: ../lib/puppet/provider/package/apt.rb:43
 msgid "/etc/apt/sources.list contains a cdrom source; not installing.  Use 'allowcdrom' to override this failure."
 msgstr ""
 
-#: ../lib/puppet/provider/package/apt.rb:84 ../lib/puppet/provider/package/fink.rb:50
+#: ../lib/puppet/provider/package/apt.rb:88 ../lib/puppet/provider/package/fink.rb:50
 msgid "Could not find latest version"
 msgstr ""
 
-#: ../lib/puppet/provider/package/apt.rb:95 ../lib/puppet/provider/package/fink.rb:61
+#: ../lib/puppet/provider/package/apt.rb:99 ../lib/puppet/provider/package/fink.rb:61
 msgid "Preseeding %{response} to debconf-set-selections"
 msgstr ""
 
-#: ../lib/puppet/provider/package/apt.rb:99 ../lib/puppet/provider/package/fink.rb:65
+#: ../lib/puppet/provider/package/apt.rb:103 ../lib/puppet/provider/package/fink.rb:65
 msgid "No responsefile specified or non existent, not preseeding anything"
 msgstr ""
 
@@ -6679,11 +6739,19 @@ msgstr ""
 msgid "Cannot match %{line}"
 msgstr ""
 
-#: ../lib/puppet/provider/package/dpkg.rb:85
+#: ../lib/puppet/provider/package/dnfmodule.rb:30
+msgid "Modules are not supported on DNF versions lower than 3.0.1"
+msgstr ""
+
+#: ../lib/puppet/provider/package/dpkg.rb:90
 msgid "You cannot install dpkg packages without a source"
 msgstr ""
 
-#: ../lib/puppet/provider/package/dpkg.rb:110
+#: ../lib/puppet/provider/package/dpkg.rb:115
+msgid "Could not update: You cannot install dpkg packages without a source"
+msgstr ""
+
+#: ../lib/puppet/provider/package/dpkg.rb:119
 msgid "source doesn't contain named package, but %{name}"
 msgstr ""
 
@@ -6821,6 +6889,10 @@ msgstr ""
 msgid "Refusing to install package group %{resource_name}, because allow_virtual is false."
 msgstr ""
 
+#: ../lib/puppet/provider/package/pip.rb:54
+msgid "Cannot resolve pip version"
+msgstr ""
+
 #: ../lib/puppet/provider/package/pkg.rb:53 ../lib/puppet/provider/package/pkg.rb:63
 msgid "Unknown format %{resource_name}: %{full_flags}[%{bad_flag}]"
 msgstr ""
@@ -7036,7 +7108,7 @@ msgid "Overrides file could not be read, trying again."
 msgstr ""
 
 #. TRANSLATORS 'runsvdir' is a linux service name and should not be translated
-#: ../lib/puppet/provider/service/runit.rb:93
+#: ../lib/puppet/provider/service/runit.rb:87
 msgid "Waiting 5 seconds for runsvdir to discover service %{service}"
 msgstr ""
 
@@ -7103,22 +7175,22 @@ msgid "ruby-shadow doesn't support %{method}"
 msgstr ""
 
 #: ../lib/puppet/provider/user/windows_adsi.rb:128
-msgid "The user account '%s' is disabled; puppet will not reset the password"
+msgid "The user account '%s' is disabled; The password will still be changed"
 msgstr ""
 
 #: ../lib/puppet/provider/user/windows_adsi.rb:130
-msgid "The user account '%s' is locked out; puppet will not reset the password"
+msgid "The user account '%s' is locked out; The password will still be changed"
 msgstr ""
 
 #: ../lib/puppet/provider/user/windows_adsi.rb:132
-msgid "The user account '%s' is expired; puppet will not reset the password"
+msgid "The user account '%s' is expired; The password will still be changed"
 msgstr ""
 
 #: ../lib/puppet/reference/indirection.rb:22
 msgid "Could not build docs for indirector %{name}, terminus %{terminus}: could not locate terminus."
 msgstr ""
 
-#: ../lib/puppet/reference/metaparameter.rb:30
+#: ../lib/puppet/reference/metaparameter.rb:28
 msgid "incorrect metaparams: %{detail}"
 msgstr ""
 
@@ -7152,11 +7224,11 @@ msgid ""
 "  - Missing features %{values}\n"
 msgstr ""
 
-#: ../lib/puppet/reference/type.rb:81
+#: ../lib/puppet/reference/type.rb:77
 msgid "Could not retrieve property %{sname} on type %{type_name}"
 msgstr ""
 
-#: ../lib/puppet/reference/type.rb:85
+#: ../lib/puppet/reference/type.rb:81
 msgid "No docs for %{type}[%{sname}]"
 msgstr ""
 
@@ -7432,19 +7504,19 @@ msgstr ""
 msgid "Not attempting to load %{type} %{fqname} as this object was missing during a prior compilation"
 msgstr ""
 
-#: ../lib/puppet/rest/route.rb:46
+#: ../lib/puppet/rest/route.rb:47
 msgid "Connection to cached server and port %{server}:%{port} failed: %{message}"
 msgstr ""
 
-#: ../lib/puppet/rest/routes.rb:43
+#: ../lib/puppet/rest/routes.rb:46
 msgid "Downloaded certificate for %{name} from %{server}"
 msgstr ""
 
-#: ../lib/puppet/rest/routes.rb:73
+#: ../lib/puppet/rest/routes.rb:76
 msgid "Downloaded certificate revocation list for %{name} from %{server}"
 msgstr ""
 
-#: ../lib/puppet/rest/routes.rb:126
+#: ../lib/puppet/rest/routes.rb:129
 msgid "Downloaded existing certificate request for %{name} from %{server}"
 msgstr ""
 
@@ -7820,7 +7892,7 @@ msgid ""
 "%{crl}"
 msgstr ""
 
-#: ../lib/puppet/ssl/host.rb:391 ../lib/puppet/ssl/state_machine.rb:119
+#: ../lib/puppet/ssl/host.rb:391 ../lib/puppet/ssl/state_machine.rb:120
 msgid "Could not download CRLs: %{message}"
 msgstr ""
 
@@ -7936,95 +8008,99 @@ msgstr ""
 msgid "Certificate '%{subject}' failed verification (%{err}): %{err_utf8}"
 msgstr ""
 
-#: ../lib/puppet/ssl/state_machine.rb:52
+#: ../lib/puppet/ssl/state_machine.rb:53
 msgid "Verified CA bundle with digest (%{digest_type}) %{actual_digest}"
 msgstr ""
 
-#: ../lib/puppet/ssl/state_machine.rb:55
+#: ../lib/puppet/ssl/state_machine.rb:56
 msgid "CA bundle with digest (%{digest_type}) %{actual_digest} did not match expected digest %{expected_digest}"
 msgstr ""
 
-#: ../lib/puppet/ssl/state_machine.rb:71
+#: ../lib/puppet/ssl/state_machine.rb:72
 msgid "CA certificate is missing from the server"
 msgstr ""
 
-#: ../lib/puppet/ssl/state_machine.rb:73
+#: ../lib/puppet/ssl/state_machine.rb:74
 msgid "Could not download CA certificate: %{message}"
 msgstr ""
 
-#: ../lib/puppet/ssl/state_machine.rb:117
+#: ../lib/puppet/ssl/state_machine.rb:118
 msgid "CRL is missing from the server"
 msgstr ""
 
-#: ../lib/puppet/ssl/state_machine.rb:126
+#: ../lib/puppet/ssl/state_machine.rb:127
 msgid "Refreshing CRL"
 msgstr ""
 
-#: ../lib/puppet/ssl/state_machine.rb:132
+#: ../lib/puppet/ssl/state_machine.rb:133
 msgid "CRL is unmodified, using existing CRL"
 msgstr ""
 
-#: ../lib/puppet/ssl/state_machine.rb:134 ../lib/puppet/ssl/state_machine.rb:140
+#: ../lib/puppet/ssl/state_machine.rb:135 ../lib/puppet/ssl/state_machine.rb:141
 msgid "Failed to refresh CRL, using existing CRL: %{message}"
 msgstr ""
 
-#: ../lib/puppet/ssl/state_machine.rb:164
+#: ../lib/puppet/ssl/state_machine.rb:166
 msgid "Loading/generating private key"
 msgstr ""
 
-#: ../lib/puppet/ssl/state_machine.rb:181
+#: ../lib/puppet/ssl/state_machine.rb:183
 msgid "Creating a new RSA SSL key for %{name}"
 msgstr ""
 
-#: ../lib/puppet/ssl/state_machine.rb:211
+#: ../lib/puppet/ssl/state_machine.rb:213
 msgid "Generating and submitting a CSR"
 msgstr ""
 
-#: ../lib/puppet/ssl/state_machine.rb:221
+#: ../lib/puppet/ssl/state_machine.rb:224
 msgid "Failed to submit the CSR, HTTP response was %{code}"
 msgstr ""
 
-#: ../lib/puppet/ssl/state_machine.rb:230
+#: ../lib/puppet/ssl/state_machine.rb:233
 msgid "Downloading client certificate"
 msgstr ""
 
-#: ../lib/puppet/ssl/state_machine.rb:245
+#: ../lib/puppet/ssl/state_machine.rb:239
+msgid "Downloaded certificate for %{name} from %{url}"
+msgstr ""
+
+#: ../lib/puppet/ssl/state_machine.rb:250
 msgid "Failed to parse certificate: %{message}"
 msgstr ""
 
-#: ../lib/puppet/ssl/state_machine.rb:248
+#: ../lib/puppet/ssl/state_machine.rb:253
 msgid "Certificate for %{certname} has not been signed yet"
 msgstr ""
 
-#: ../lib/puppet/ssl/state_machine.rb:249
+#: ../lib/puppet/ssl/state_machine.rb:254
 msgid "Couldn't fetch certificate from CA server; you might still need to sign this agent's certificate (%{name})."
 msgstr ""
 
-#: ../lib/puppet/ssl/state_machine.rb:252
+#: ../lib/puppet/ssl/state_machine.rb:257
 msgid "Failed to retrieve certificate for %{certname}: %{message}"
 msgstr ""
 
-#: ../lib/puppet/ssl/state_machine.rb:268
+#: ../lib/puppet/ssl/state_machine.rb:273
 msgid "Exiting now because the waitforcert setting is set to 0."
 msgstr ""
 
-#: ../lib/puppet/ssl/state_machine.rb:271
+#: ../lib/puppet/ssl/state_machine.rb:276
 msgid "Couldn't fetch certificate from CA server; you might still need to sign this agent's certificate (%{name}). Exiting now because the maxwaitforcert timeout has been exceeded."
 msgstr ""
 
-#: ../lib/puppet/ssl/state_machine.rb:274
+#: ../lib/puppet/ssl/state_machine.rb:279
 msgid "Will try again in %{time} seconds."
 msgstr ""
 
-#: ../lib/puppet/ssl/state_machine.rb:371
+#: ../lib/puppet/ssl/state_machine.rb:379
 msgid "Verified client certificate '%{subject}' fingerprint %{digest}"
 msgstr ""
 
-#: ../lib/puppet/ssl/state_machine.rb:373
+#: ../lib/puppet/ssl/state_machine.rb:381
 msgid "Verified CA certificate '%{subject}' fingerprint %{digest}"
 msgstr ""
 
-#: ../lib/puppet/ssl/state_machine.rb:413
+#: ../lib/puppet/ssl/state_machine.rb:421
 msgid "Another puppet instance is already running; exiting"
 msgstr ""
 
@@ -8313,31 +8389,31 @@ msgstr ""
 msgid "Could not find parent provider %{parent} of %{name}"
 msgstr ""
 
-#: ../lib/puppet/type.rb:1974
+#: ../lib/puppet/type.rb:1972
 msgid "Invalid %{resource} provider '%{provider_class}'"
 msgstr ""
 
-#: ../lib/puppet/type.rb:2059
+#: ../lib/puppet/type.rb:2057
 msgid "Could not find %{name} provider of %{provider}"
 msgstr ""
 
-#: ../lib/puppet/type.rb:2177
+#: ../lib/puppet/type.rb:2175
 msgid "You cannot add relationships without a catalog"
 msgstr ""
 
-#: ../lib/puppet/type.rb:2481
+#: ../lib/puppet/type.rb:2479
 msgid "Unable to mark '%{name}' as sensitive: %{name} is a parameter and not a property, and cannot be automatically redacted."
 msgstr ""
 
-#: ../lib/puppet/type.rb:2484
+#: ../lib/puppet/type.rb:2482
 msgid "Unable to mark '%{name}' as sensitive: the property itself was not assigned a value."
 msgstr ""
 
-#: ../lib/puppet/type.rb:2486
+#: ../lib/puppet/type.rb:2484
 msgid "Unable to mark '%{name}' as sensitive: the property itself is not defined on %{type}."
 msgstr ""
 
-#: ../lib/puppet/type.rb:2544
+#: ../lib/puppet/type.rb:2542
 msgid "Could not set %{attribute} on %{class_name}: %{detail}"
 msgstr ""
 
@@ -8349,64 +8425,64 @@ msgstr ""
 msgid "Command exceeded timeout"
 msgstr ""
 
-#: ../lib/puppet/type/exec.rb:177
+#: ../lib/puppet/type/exec.rb:181
 msgid "[command redacted] returned %{status} instead of one of [%{expected}]"
 msgstr ""
 
-#: ../lib/puppet/type/exec.rb:179
+#: ../lib/puppet/type/exec.rb:183
 msgid "'%{cmd}' returned %{status} instead of one of [%{expected}]"
 msgstr ""
 
-#: ../lib/puppet/type/exec.rb:200
+#: ../lib/puppet/type/exec.rb:204
 msgid "Command must be a String, got value of class %{klass}"
 msgstr ""
 
-#: ../lib/puppet/type/exec.rb:232
+#: ../lib/puppet/type/exec.rb:236
 msgid "Unable to execute commands as other users on Windows"
 msgstr ""
 
-#: ../lib/puppet/type/exec.rb:234
+#: ../lib/puppet/type/exec.rb:238
 msgid "Only root can execute commands as other users"
 msgstr ""
 
-#: ../lib/puppet/type/exec.rb:290
+#: ../lib/puppet/type/exec.rb:294
 msgid "Invalid environment setting '%{value}'"
 msgstr ""
 
-#: ../lib/puppet/type/exec.rb:303
+#: ../lib/puppet/type/exec.rb:307
 msgid "The umask specification is invalid: %{value}"
 msgstr ""
 
-#: ../lib/puppet/type/exec.rb:319
+#: ../lib/puppet/type/exec.rb:323
 msgid "The timeout must be a number."
 msgstr ""
 
-#: ../lib/puppet/type/exec.rb:336
+#: ../lib/puppet/type/exec.rb:340
 msgid "Tries must be an integer"
 msgstr ""
 
-#: ../lib/puppet/type/exec.rb:340
+#: ../lib/puppet/type/exec.rb:344
 msgid "Tries must be an integer >= 1"
 msgstr ""
 
-#: ../lib/puppet/type/exec.rb:353
+#: ../lib/puppet/type/exec.rb:357
 msgid "try_sleep must be a number"
 msgstr ""
 
-#: ../lib/puppet/type/exec.rb:357
+#: ../lib/puppet/type/exec.rb:361
 msgid "try_sleep cannot be a negative number"
 msgstr ""
 
 #. TRANSLATORS 'creates' is a parameter name and should not be translated
-#: ../lib/puppet/type/exec.rb:429
+#: ../lib/puppet/type/exec.rb:433
 msgid "Checking that 'creates' path '%{creates_path}' exists"
 msgstr ""
 
-#: ../lib/puppet/type/exec.rb:474 ../lib/puppet/type/exec.rb:530
+#: ../lib/puppet/type/exec.rb:478 ../lib/puppet/type/exec.rb:534
 msgid "Check %{value} exceeded timeout"
 msgstr ""
 
-#: ../lib/puppet/type/exec.rb:619
+#: ../lib/puppet/type/exec.rb:623
 msgid "'%{cmd}' won't be executed because of failed check '%{check}'"
 msgstr ""
 
@@ -8462,38 +8538,38 @@ msgstr ""
 msgid "Could not find filebucket %{backup} specified in backup"
 msgstr ""
 
-#: ../lib/puppet/type/file.rb:764
+#: ../lib/puppet/type/file.rb:763
 msgid "Could not back up file of type %{current_type}"
 msgstr ""
 
-#: ../lib/puppet/type/file.rb:779
+#: ../lib/puppet/type/file.rb:778
 msgid "Could not remove files of type %{current_type}"
 msgstr ""
 
 #. TRANSLATORS "source_permissions => ignore" should not be translated
-#: ../lib/puppet/type/file.rb:790
+#: ../lib/puppet/type/file.rb:789
 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:871 ../lib/puppet/type/tidy.rb:352
+#: ../lib/puppet/type/file.rb:870 ../lib/puppet/type/tidy.rb:352
 msgid "Could not stat; permission denied"
 msgstr ""
 
-#: ../lib/puppet/type/file.rb:874
+#: ../lib/puppet/type/file.rb:873
 msgid "Could not stat; invalid pathname"
 msgstr ""
 
-#: ../lib/puppet/type/file.rb:1002
+#: ../lib/puppet/type/file.rb:1001
 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:1027
+#: ../lib/puppet/type/file.rb:1026
 msgid "Could not back up; will not remove"
 msgstr ""
 
-#: ../lib/puppet/type/file.rb:1041
+#: ../lib/puppet/type/file.rb:1040
 msgid "File written to disk did not match checksum; discarding changes (%{content_checksum} vs %{newsum})"
 msgstr ""
 
@@ -9259,7 +9335,7 @@ msgstr ""
 msgid "Could not write crontab for %{path}: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/util/http_proxy.rb:223
+#: ../lib/puppet/util/http_proxy.rb:215
 msgid "Too many HTTP redirections for %{uri}"
 msgstr ""
 
@@ -9535,7 +9611,7 @@ msgstr ""
 msgid "Could not open SELinux category translation file %{path}."
 msgstr ""
 
-#: ../lib/puppet/util/selinux.rb:248
+#: ../lib/puppet/util/selinux.rb:250
 msgid "got a relative path in SELinux find_fs: %{path}"
 msgstr ""
 
@@ -9775,39 +9851,39 @@ msgstr ""
 msgid "Failed to open registry key '%{key}\\%{path}'"
 msgstr ""
 
-#: ../lib/puppet/util/windows/registry.rb:128
+#: ../lib/puppet/util/windows/registry.rb:130
 msgid "Failed to enumerate %{key} registry keys at index %{index}"
 msgstr ""
 
-#: ../lib/puppet/util/windows/registry.rb:159
+#: ../lib/puppet/util/windows/registry.rb:161
 msgid "Failed to enumerate %{key} registry values at index %{index}"
 msgstr ""
 
-#: ../lib/puppet/util/windows/registry.rb:189
+#: ../lib/puppet/util/windows/registry.rb:191
 msgid "Failed to query registry %{key} for sizes"
 msgstr ""
 
-#: ../lib/puppet/util/windows/registry.rb:225
+#: ../lib/puppet/util/windows/registry.rb:227
 msgid "Type mismatch (expect %{rtype} but %{type} present)"
 msgstr ""
 
-#: ../lib/puppet/util/windows/registry.rb:247
+#: ../lib/puppet/util/windows/registry.rb:249
 msgid "Type %{type} is not supported."
 msgstr ""
 
-#: ../lib/puppet/util/windows/registry.rb:252
+#: ../lib/puppet/util/windows/registry.rb:254
 msgid "A value in the registry key %{parent_key_name}%{key} is corrupt or invalid"
 msgstr ""
 
-#: ../lib/puppet/util/windows/registry.rb:274
+#: ../lib/puppet/util/windows/registry.rb:276
 msgid "Failed to read registry value %{value} at %{key}"
 msgstr ""
 
-#: ../lib/puppet/util/windows/registry.rb:292
+#: ../lib/puppet/util/windows/registry.rb:294
 msgid "Failed to delete registry value %{name} at %{key}"
 msgstr ""
 
-#: ../lib/puppet/util/windows/registry.rb:307
+#: ../lib/puppet/util/windows/registry.rb:309
 msgid "Failed to delete registry key %{name} at %{key}"
 msgstr ""