puppet 6.1.0-x86-mingw32 → 6.2.0-x86-mingw32

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

@@ -1,7 +1,14 @@
 require 'puppet/provider/package'
 
 Puppet::Type.type(:package).provide :pkg, :parent => Puppet::Provider::Package do
-  desc "OpenSolaris image packaging system. See pkg(5) for more information."
+  desc "OpenSolaris image packaging system. See pkg(5) for more information.
+
+    This provider supports the `install_options` attribute, which allows
+    command-line flags to be passed to pkg. These options should be specified:
+    - as a string (for example, '--flag'), or
+    - as a hash (for example, {'--flag' => 'value'}), or
+    - as an array where each element is either a string or a hash."
+
   # https://docs.oracle.com/cd/E19963-01/html/820-6572/managepkgs.html
   # A few notes before we start:
   # Opensolaris pkg has two slightly different formats (as of now.)
@@ -19,6 +26,8 @@ Puppet::Type.type(:package).provide :pkg, :parent => Puppet::Provider::Package d
 
   has_feature :holdable
 
+  has_feature :install_options
+
   commands :pkg => "/usr/bin/pkg"
 
   confine :osfamily => :solaris
@@ -152,7 +161,9 @@ Puppet::Type.type(:package).provide :pkg, :parent => Puppet::Provider::Package d
       end
       potential_matches.each{ |p|
         command = is == :absent ? 'install' : 'update'
-        status = exec_cmd(command(:pkg), command, '-n', "#{name}@#{p[:ensure]}")[:exit]
+        options = ['-n']
+        options.concat(join_options(@resource[:install_options])) if @resource[:install_options]
+        status = exec_cmd(command(:pkg), command, *options, "#{name}@#{p[:ensure]}")[:exit]
         case status
         when 4
           # if the first installable match would cause no changes, we're in sync
@@ -190,8 +201,12 @@ Puppet::Type.type(:package).provide :pkg, :parent => Puppet::Provider::Package d
     # Now we know there is a newer version. But is that installable? (i.e are there any constraints?)
     # return the first known we find. The only way that is currently available is to do a dry run of
     # pkg update and see if could get installed (`pkg update -n res`).
-    known = lst.find {|p| p[:status] == 'known' }
-    return known[:ensure] if known and exec_cmd(command(:pkg), 'update', '-n', @resource[:name])[:exit].zero?
+    known = lst.find { |p| p[:status] == 'known' }
+    if known
+      options = ['-n']
+      options.concat(join_options(@resource[:install_options])) if @resource[:install_options]
+      return known[:ensure] if exec_cmd(command(:pkg), 'update', *options, @resource[:name])[:exit].zero?
+    end
 
     # If not, then return the installed, else nil
     (lst.find {|p| p[:status] == 'installed' } || {})[:ensure]
@@ -213,6 +228,7 @@ Puppet::Type.type(:package).provide :pkg, :parent => Puppet::Provider::Package d
     if Puppet::Util::Package.versioncmp(Facter.value(:operatingsystemrelease), '11.2') >= 0
       args.push('--sync-actuators-timeout', '900')
     end
+    args.concat(join_options(@resource[:install_options])) if @resource[:install_options]
     unless should.is_a? Symbol
       name += "@#{should}"
     end

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

@@ -111,7 +111,16 @@ Puppet::Type.type(:package).provide :portage, :parent => Puppet::Provider::Packa
     @atom ||= begin
       package_info = {}
       # do the search
-      search_output = qatom_bin(*([@resource[:name], '--format', output_format]))
+      should = @resource[:ensure]
+      case should
+      # The terms present, absent, purged, held, installed, latest in :ensure 
+      # resolve as Symbols, and we do not need specific package version in this case
+      when true, false, Symbol
+        search = @resource[:name]
+      else
+        search = '=' + @resource[:name] + '-' + "#{should}"
+      end
+      search_output = qatom_bin(*([search, '--format', output_format]))
       # verify if the search found anything
       match = result_format.match(search_output)
       if match
@@ -197,9 +206,11 @@ Puppet::Type.type(:package).provide :portage, :parent => Puppet::Provider::Packa
           # ensure is what is currently installed
           # This DOES NOT choose to install/upgrade or not, just provides current info
           # prefer checking versions to slots as versions are finer grained
-          if qatom[:pv]
-            package[:version_available] = eix_get_version_for_versions(package[:installable_versions], qatom[:pv])
-            package[:ensure] = eix_get_version_for_versions(package[:installed_versions], qatom[:pv])
+          search = qatom[:pv]
+          search = search + '-' + qatom[:pr] if qatom[:pr]
+          if search
+            package[:version_available] = eix_get_version_for_versions(package[:installable_versions], search)
+            package[:ensure] = eix_get_version_for_versions(package[:installed_versions], search)
           elsif qatom[:slot]
             package[:version_available] = eix_get_version_for_slot(package[:slot_versions_available], qatom[:slot])
             package[:ensure] = eix_get_version_for_slot(package[:installed_slots], qatom[:slot])

data/lib/puppet/rest/route.rb

@@ -50,7 +50,7 @@ module Puppet::Rest
       end
 
       if Puppet[:use_srv_records]
-        dns_resolver.each_srv_record(@srv_service) do |srv_server, srv_port|
+        dns_resolver.each_srv_record(Puppet[:srv_domain], @srv_service) do |srv_server, srv_port|
           # Try each of the servers for this service in weighted order
           # until a working one is found.
           begin

data/lib/puppet/settings.rb

@@ -255,7 +255,7 @@ class Puppet::Settings
     @global_defaults_initialized
   end
 
-  def initialize_global_settings(args = [])
+  def initialize_global_settings(args = [], require_config = true)
     raise Puppet::DevError, _("Attempting to initialize global default settings more than once!") if global_defaults_initialized?
 
     # The first two phases of the lifecycle of a puppet application are:
@@ -264,7 +264,7 @@ class Puppet::Settings
     # 2) Parse the puppet config file(s).
 
     parse_global_options(args)
-    parse_config_files
+    parse_config_files(require_config)
 
     @global_defaults_initialized = true
   end
@@ -590,14 +590,19 @@ class Puppet::Settings
   end
 
   # Parse the configuration file.  Just provides thread safety.
-  def parse_config_files
+  def parse_config_files(require_config = true)
     file = which_configuration_file
     if Puppet::FileSystem.exist?(file)
       begin
         text = read_file(file)
       rescue => detail
-        Puppet.log_exception(detail, "Could not load #{file}: #{detail}")
-        return
+        message = _("Could not load %{file}: %{detail}") % { file: file, detail: detail}
+        if require_config
+          Puppet.log_and_raise(detail, message)
+        else
+          Puppet.log_exception(detail, message)
+          return
+        end
       end
     else
       return

data/lib/puppet/transaction.rb

@@ -56,6 +56,8 @@ class Puppet::Transaction
     @prefetched_providers = Hash.new { |h,k| h[k] = {} }
 
     @prefetch_failed_providers = Hash.new { |h,k| h[k] = {} }
+
+    @failed_dependencies_already_notified = Set.new()
   end
 
   # Invoke the pre_run_check hook in every resource in the catalog.
@@ -291,8 +293,9 @@ class Puppet::Transaction
     if s && s.dependency_failed?
       # See above. --daniel 2011-06-06
       unless suppress_report then
-        s.failed_dependencies.each do |dep|
+        s.failed_dependencies.find_all { |d| !(@failed_dependencies_already_notified.include?(d.ref)) }.each do |dep|
           resource.notice _("Dependency %{dep} has failures: %{status}") % { dep: dep, status: resource_status(dep).failed }
+          @failed_dependencies_already_notified.add(dep.ref)
         end
       end
     end
@@ -355,15 +358,17 @@ class Puppet::Transaction
     Puppet.debug "Prefetching #{provider_class.name} resources for #{type_name}"
     begin
       provider_class.prefetch(resources)
-    rescue Exception => detail
-      if !detail.is_a?(LoadError) && !detail.is_a?(Puppet::MissingCommand)
-        raise unless Puppet.settings[:future_features]
-        
-        @prefetch_failed_providers[type_name][provider_class.name] = true
-      end
+    rescue LoadError, Puppet::MissingCommand => detail
       #TRANSLATORS `prefetch` is a function name and should not be translated
       message = _("Could not prefetch %{type_name} provider '%{name}': %{detail}") % { type_name: type_name, name: provider_class.name, detail: detail }
       Puppet.log_exception(detail, message)
+    rescue StandardError => detail
+      message = _("Could not prefetch %{type_name} provider '%{name}': %{detail}") % { type_name: type_name, name: provider_class.name, detail: detail }
+      Puppet.log_exception(detail, message)
+
+      raise unless Puppet.settings[:future_features]
+
+      @prefetch_failed_providers[type_name][provider_class.name] = true
     end
     @prefetched_providers[type_name][provider_class.name] = true
   end

data/lib/puppet/util/command_line.rb

@@ -64,8 +64,12 @@ module Puppet
       #
       # @return [void]
       def execute
+        require_config = true
+        if @argv.first =~ /help|-h|--help|-V|--version/
+          require_config = false
+        end
         Puppet::Util.exit_on_fail(_("Could not initialize global default settings")) do
-          Puppet.initialize_settings(args)
+          Puppet.initialize_settings(args, require_config)
         end
 
         setpriority(Puppet[:priority])

data/lib/puppet/util/log/destinations.rb

@@ -66,6 +66,7 @@ Puppet::Util::Log.newdesttype :file do
   def initialize(path)
     @name = path
     @json = path.end_with?('.json') ? 1 : 0
+    @jsonl = path.end_with?('.jsonl')
 
     # first make sure the directory exists
     # We can't just use 'Config.use' here, because they've
@@ -111,6 +112,8 @@ Puppet::Util::Log.newdesttype :file do
     if @json > 0
       @json > 1 ? @file.puts(',') : @json = 2
       @file.puts(Puppet::Util::Json.dump(msg.to_structured_hash))
+    elsif @jsonl
+      @file.puts(Puppet::Util::Json.dump(msg.to_structured_hash))
     else
       @file.puts("#{msg.time} #{msg.source} (#{msg.level}): #{msg}")
     end

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

data/locales/puppet.pot

@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
-# Copyright (C) 2018 Puppet, Inc.
+# Copyright (C) 2019 Puppet, Inc.
 # This file is distributed under the same license as the Puppet automation framework package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2018.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2019.
 #
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Puppet automation framework 6.0.4-203-g3db83f5\n"
+"Project-Id-Version: Puppet automation framework 6.1.0-99-g8d13182\n"
 "\n"
 "Report-Msgid-Bugs-To: https://tickets.puppetlabs.com\n"
-"POT-Creation-Date: 2018-12-07 19:18+0000\n"
-"PO-Revision-Date: 2018-12-07 19:18+0000\n"
+"POT-Creation-Date: 2019-01-22 21:33+0000\n"
+"PO-Revision-Date: 2019-01-22 21:33+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
@@ -164,7 +164,7 @@ msgstr ""
 msgid "No help available for puppet %{app_name}"
 msgstr ""
 
-#: ../lib/puppet/application/agent.rb:24 ../lib/puppet/application/device.rb:22
+#: ../lib/puppet/application/agent.rb:24 ../lib/puppet/application/device.rb:23
 msgid "Cancelling startup"
 msgstr ""
 
@@ -172,19 +172,19 @@ msgstr ""
 msgid "The puppet agent daemon"
 msgstr ""
 
-#: ../lib/puppet/application/agent.rb:360
+#: ../lib/puppet/application/agent.rb:363
 msgid "Fingerprint asked but no certificate nor certificate request have yet been issued"
 msgstr ""
 
-#: ../lib/puppet/application/agent.rb:365
+#: ../lib/puppet/application/agent.rb:368
 msgid "Could not get fingerprint for digest '%{digest}'"
 msgstr ""
 
-#: ../lib/puppet/application/agent.rb:389
+#: ../lib/puppet/application/agent.rb:392
 msgid "Starting Puppet client version %{version}"
 msgstr ""
 
-#: ../lib/puppet/application/agent.rb:405
+#: ../lib/puppet/application/agent.rb:408
 msgid "The puppet agent command does not take parameters"
 msgstr ""
 
@@ -194,35 +194,35 @@ msgstr ""
 
 #. TRANSLATORS "puppet apply" is a program command and should not be translated
 #. TRANSLATORS "puppet apply" is a program command and should not be translated
-#: ../lib/puppet/application/apply.rb:204 ../lib/puppet/application/apply.rb:319
+#: ../lib/puppet/application/apply.rb:207 ../lib/puppet/application/apply.rb:322
 msgid "For puppet apply"
 msgstr ""
 
-#: ../lib/puppet/application/apply.rb:212
+#: ../lib/puppet/application/apply.rb:215
 msgid "%{file} is not readable"
 msgstr ""
 
-#: ../lib/puppet/application/apply.rb:290 ../lib/puppet/application/script.rb:238
+#: ../lib/puppet/application/apply.rb:293 ../lib/puppet/application/script.rb:241
 msgid "Exiting"
 msgstr ""
 
-#: ../lib/puppet/application/apply.rb:329
+#: ../lib/puppet/application/apply.rb:332
 msgid "Could not deserialize catalog from %{format}: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/application/apply.rb:350 ../lib/puppet/application/script.rb:141
+#: ../lib/puppet/application/apply.rb:353 ../lib/puppet/application/script.rb:144
 msgid "Could not find facts for %{node}"
 msgstr ""
 
-#: ../lib/puppet/application/apply.rb:363 ../lib/puppet/application/script.rb:150
+#: ../lib/puppet/application/apply.rb:366 ../lib/puppet/application/script.rb:153
 msgid "Could not find node %{node}"
 msgstr ""
 
-#: ../lib/puppet/application/apply.rb:376 ../lib/puppet/application/script.rb:134
+#: ../lib/puppet/application/apply.rb:379 ../lib/puppet/application/script.rb:137
 msgid "Could not find file %{manifest}"
 msgstr ""
 
-#: ../lib/puppet/application/apply.rb:377
+#: ../lib/puppet/application/apply.rb:380
 msgid "Only one file can be applied per run.  Skipping %{files}"
 msgstr ""
 
@@ -234,51 +234,51 @@ msgstr ""
 msgid "Display help about resource types"
 msgstr ""
 
-#: ../lib/puppet/application/device.rb:77
+#: ../lib/puppet/application/device.rb:82
 msgid "Manage remote network devices"
 msgstr ""
 
-#: ../lib/puppet/application/device.rb:216
+#: ../lib/puppet/application/device.rb:229
 msgid "resource command requires target"
 msgstr ""
 
-#: ../lib/puppet/application/device.rb:219
+#: ../lib/puppet/application/device.rb:232
 msgid "facts command requires target"
 msgstr ""
 
-#: ../lib/puppet/application/device.rb:222
+#: ../lib/puppet/application/device.rb:235
 msgid "missing argument: --target is required when using --apply"
 msgstr ""
 
-#: ../lib/puppet/application/device.rb:223
+#: ../lib/puppet/application/device.rb:236
 msgid "%{file} does not exist, cannot apply"
 msgstr ""
 
-#: ../lib/puppet/application/device.rb:239
+#: ../lib/puppet/application/device.rb:253
 msgid "Target device / certificate '%{target}' not found in %{config}"
 msgstr ""
 
-#: ../lib/puppet/application/device.rb:241
+#: ../lib/puppet/application/device.rb:255
 msgid "No device found in %{config}"
 msgstr ""
 
-#: ../lib/puppet/application/device.rb:263
+#: ../lib/puppet/application/device.rb:281
 msgid "retrieving resource: %{resource} from %{target} at %{scheme}%{url_host}%{port}%{url_path}"
 msgstr ""
 
-#: ../lib/puppet/application/device.rb:278
+#: ../lib/puppet/application/device.rb:296
 msgid "retrieving facts from %{target} at %{scheme}%{url_host}%{port}%{url_path}"
 msgstr ""
 
-#: ../lib/puppet/application/device.rb:303
+#: ../lib/puppet/application/device.rb:321
 msgid "starting applying configuration to %{target} at %{scheme}%{url_host}%{port}%{url_path}"
 msgstr ""
 
-#: ../lib/puppet/application/device.rb:340 ../lib/puppet/application/resource.rb:196
+#: ../lib/puppet/application/device.rb:359 ../lib/puppet/application/resource.rb:196
 msgid "You must specify the type to display"
 msgstr ""
 
-#: ../lib/puppet/application/device.rb:341 ../lib/puppet/application/resource.rb:197
+#: ../lib/puppet/application/device.rb:360 ../lib/puppet/application/resource.rb:197
 msgid "Could not find type %{type}"
 msgstr ""
 
@@ -426,11 +426,11 @@ msgstr ""
 msgid "Run a puppet manifests as a script without compiling a catalog"
 msgstr ""
 
-#: ../lib/puppet/application/script.rb:121
+#: ../lib/puppet/application/script.rb:124
 msgid "Bolt must be installed to use the script application"
 msgstr ""
 
-#: ../lib/puppet/application/script.rb:135
+#: ../lib/puppet/application/script.rb:138
 msgid "Only one file can be used per run. Skipping %{files}"
 msgstr ""
 
@@ -506,7 +506,7 @@ msgid ""
 "  puppet ssl clean\n"
 msgstr ""
 
-#: ../lib/puppet/application/ssl.rb:214
+#: ../lib/puppet/application/ssl.rb:213
 msgid "Removed %{label} %{path}"
 msgstr ""
 
@@ -701,15 +701,15 @@ msgstr ""
 msgid "Certificate names must be lower case"
 msgstr ""
 
-#: ../lib/puppet/defaults.rb:961 ../lib/puppet/settings/enum_setting.rb:13 ../lib/puppet/settings/symbolic_enum_setting.rb:14
+#: ../lib/puppet/defaults.rb:962 ../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 ""
 
-#: ../lib/puppet/defaults.rb:1458 ../lib/puppet/defaults.rb:1473
+#: ../lib/puppet/defaults.rb:1459 ../lib/puppet/defaults.rb:1474
 msgid "Attempted to set both server and server_list."
 msgstr ""
 
-#: ../lib/puppet/defaults.rb:1459 ../lib/puppet/defaults.rb:1474
+#: ../lib/puppet/defaults.rb:1460 ../lib/puppet/defaults.rb:1475
 msgid "Server setting will not be used."
 msgstr ""
 
@@ -1798,23 +1798,23 @@ msgstr ""
 msgid "The current user does not have the necessary permission to manage symlinks."
 msgstr ""
 
-#: ../lib/puppet/forge.rb:136
+#: ../lib/puppet/forge.rb:139
 msgid "Malformed dependency: %{name}."
 msgstr ""
 
-#: ../lib/puppet/forge.rb:137
+#: ../lib/puppet/forge.rb:140
 msgid "Exception was: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/forge.rb:203
+#: ../lib/puppet/forge.rb:206
 msgid "Downloaded release for %{name} did not match expected checksum"
 msgstr ""
 
-#: ../lib/puppet/forge.rb:211 ../lib/puppet/module_tool/applications/unpacker.rb:58 ../lib/puppet/module_tool/local_tarball.rb:86
+#: ../lib/puppet/forge.rb:214 ../lib/puppet/module_tool/applications/unpacker.rb:58 ../lib/puppet/module_tool/local_tarball.rb:86
 msgid "Could not extract contents of module archive: %{message}"
 msgstr ""
 
-#: ../lib/puppet/forge.rb:228
+#: ../lib/puppet/forge.rb:231
 msgid "Cannot consider release %{name}-%{version}: %{error}"
 msgstr ""
 
@@ -5028,487 +5028,483 @@ msgid "Float-Type [] requires all arguments to be floats, or integers (or defaul
 msgstr ""
 
 #: ../lib/puppet/pops/issues.rb:435
-msgid "one of %{expected} are"
+msgid "%{expression}[] cannot use %{actual} where one of the following is expected: %{expected}"
 msgstr ""
 
 #: ../lib/puppet/pops/issues.rb:437
-msgid "%{expected} is"
-msgstr ""
-
-#: ../lib/puppet/pops/issues.rb:439
-msgid "%{expression}[] cannot use %{actual} where %{expected_text} expected"
+msgid "%{expression}[] cannot use %{actual} where %{expected} is expected"
 msgstr ""
 
-#: ../lib/puppet/pops/issues.rb:443
+#: ../lib/puppet/pops/issues.rb:442
 msgid "A substring operation does not accept %{label_article} %{actual_type} as a character index. Expected an Integer"
 msgstr ""
 
-#: ../lib/puppet/pops/issues.rb:447
+#: ../lib/puppet/pops/issues.rb:446
 msgid "%{expression}[] argument must be a Type or a String. Got %{actual}"
 msgstr ""
 
-#: ../lib/puppet/pops/issues.rb:451
+#: ../lib/puppet/pops/issues.rb:450
 msgid "%{base_type}[] arguments must be types. Got %{actual}"
 msgstr ""
 
-#: ../lib/puppet/pops/issues.rb:457
+#: ../lib/puppet/pops/issues.rb:456
 msgid "%{base_type_label}[] accepts %{min} or more arguments. Got %{actual}"
 msgstr ""
 
-#: ../lib/puppet/pops/issues.rb:459
+#: ../lib/puppet/pops/issues.rb:458
 msgid "%{base_type_label}[] accepts %{min} to %{max} arguments. Got %{actual}"
 msgstr ""
 
-#: ../lib/puppet/pops/issues.rb:461
+#: ../lib/puppet/pops/issues.rb:460
 msgid "%{base_type_label}[] accepts %{min} %{label}. Got %{actual}"
 msgstr ""
 
-#: ../lib/puppet/pops/issues.rb:461
+#: ../lib/puppet/pops/issues.rb:460
 msgid "argument"
 msgstr ""
 
-#: ../lib/puppet/pops/issues.rb:466
+#: ../lib/puppet/pops/issues.rb:465
 msgid "Error creating type specialization of %{base_type}, %{message}"
 msgstr ""
 
-#: ../lib/puppet/pops/issues.rb:470
+#: ../lib/puppet/pops/issues.rb:469
 msgid "Cannot specialize an already specialized %{kind} type"
 msgstr ""
 
-#: ../lib/puppet/pops/issues.rb:474
+#: ../lib/puppet/pops/issues.rb:473
 msgid "First argument to Resource[] must be a resource type or a String. Got %{actual}."
 msgstr ""
 
-#: ../lib/puppet/pops/issues.rb:478
+#: ../lib/puppet/pops/issues.rb:477
 msgid "Arguments to Resource[] are all empty/undefined"
 msgstr ""
 
-#: ../lib/puppet/pops/issues.rb:482
+#: ../lib/puppet/pops/issues.rb:481
 msgid "Illegal Class name in class reference. %{expression} cannot be used where a String is expected"
 msgstr ""
 
-#: ../lib/puppet/pops/issues.rb:486
+#: ../lib/puppet/pops/issues.rb:485
 msgid "Unacceptable name. The name '%{name}' is unacceptable as the name of %{value}"
 msgstr ""
 
-#: ../lib/puppet/pops/issues.rb:490
+#: ../lib/puppet/pops/issues.rb:489
 msgid "Unacceptable location. The name '%{name}' is unacceptable in file '%{file}'"
 msgstr ""
 
-#: ../lib/puppet/pops/issues.rb:495
+#: ../lib/puppet/pops/issues.rb:494
 msgid "The %{value} '%{name}' is unacceptable as a top level construct in this location"
 msgstr ""
 
-#: ../lib/puppet/pops/issues.rb:497
+#: ../lib/puppet/pops/issues.rb:496
 msgid "This %{value} is unacceptable as a top level construct in this location"
 msgstr ""
 
-#: ../lib/puppet/pops/issues.rb:502
+#: ../lib/puppet/pops/issues.rb:501
 msgid "Parameter $%{param} is not last, and has 'captures rest'"
 msgstr ""
 
-#: ../lib/puppet/pops/issues.rb:506
+#: ../lib/puppet/pops/issues.rb:505
 msgid "Parameter $%{param} has 'captures rest' - not supported in %{container}"
 msgstr ""
 
-#: ../lib/puppet/pops/issues.rb:510
+#: ../lib/puppet/pops/issues.rb:509
 msgid "Parameter $%{param} is required but appears after optional parameters"
 msgstr ""
 
-#: ../lib/puppet/pops/issues.rb:514
+#: ../lib/puppet/pops/issues.rb:513
 msgid "Parameter $%{param} is required but no value was given"
 msgstr ""
 
-#: ../lib/puppet/pops/issues.rb:518
+#: ../lib/puppet/pops/issues.rb:517
 msgid "The value '%{value}' cannot be converted to Numeric."
 msgstr ""
 
-#: ../lib/puppet/pops/issues.rb:522
+#: ../lib/puppet/pops/issues.rb:521
 msgid "The string '%{before}' was automatically coerced to the numerical value %{after}"
 msgstr ""
 
-#: ../lib/puppet/pops/issues.rb:526
+#: ../lib/puppet/pops/issues.rb:525
 msgid "Unknown function: '%{name}'."
 msgstr ""
 
-#: ../lib/puppet/pops/issues.rb:530
+#: ../lib/puppet/pops/issues.rb:529
 msgid "Unknown variable: '%{name}'."
 msgstr ""
 
-#: ../lib/puppet/pops/issues.rb:534
+#: ../lib/puppet/pops/issues.rb:533
 msgid "Error while evaluating %{expression}, %{detail}"
 msgstr ""
 
-#: ../lib/puppet/pops/issues.rb:538
+#: ../lib/puppet/pops/issues.rb:537
 msgid "Resource type not found: %{res_type}"
 msgstr ""
 
-#: ../lib/puppet/pops/issues.rb:542
+#: ../lib/puppet/pops/issues.rb:541
 msgid "Illegal Resource Type expression, expected result to be a type name, or untitled Resource, got %{actual}"
 msgstr ""
 
-#: ../lib/puppet/pops/issues.rb:546
+#: ../lib/puppet/pops/issues.rb:545
 msgid "The title '%{title}' has already been used in this resource expression"
 msgstr ""
 
-#: ../lib/puppet/pops/issues.rb:550
+#: ../lib/puppet/pops/issues.rb:549
 msgid "The attribute '%{attribute}' has already been set"
 msgstr ""
 
-#: ../lib/puppet/pops/issues.rb:554
+#: ../lib/puppet/pops/issues.rb:553
 msgid "Missing title. The title expression resulted in undef"
 msgstr ""
 
-#: ../lib/puppet/pops/issues.rb:558
+#: ../lib/puppet/pops/issues.rb:557
 msgid "Missing title at index %{index}. The title expression resulted in an undef title"
 msgstr ""
 
-#: ../lib/puppet/pops/issues.rb:562
+#: ../lib/puppet/pops/issues.rb:561
 msgid "Illegal title type at index %{index}. Expected String, got %{actual}"
 msgstr ""
 
-#: ../lib/puppet/pops/issues.rb:566
+#: ../lib/puppet/pops/issues.rb:565
 msgid "Empty string title at %{index}. Title strings must have a length greater than zero."
 msgstr ""
 
-#: ../lib/puppet/pops/issues.rb:570
+#: ../lib/puppet/pops/issues.rb:569
 msgid "Resource not found: %{type_name}['%{title}']"
 msgstr ""
 
-#: ../lib/puppet/pops/issues.rb:574
+#: ../lib/puppet/pops/issues.rb:573
 msgid "The resource %{type_name}['%{title}'] does not have a parameter called '%{param}'"
 msgstr ""
 
-#: ../lib/puppet/pops/issues.rb:578
+#: ../lib/puppet/pops/issues.rb:577
 msgid "Division by 0"
 msgstr ""
 
-#: ../lib/puppet/pops/issues.rb:582
+#: ../lib/puppet/pops/issues.rb:581
 msgid "The result of the %{operator} expression is Infinity"
 msgstr ""
 
-#: ../lib/puppet/pops/issues.rb:587
+#: ../lib/puppet/pops/issues.rb:586
 msgid "Heredoc syntax specification has empty segment between '+' : '%{syntax}'"
 msgstr ""
 
-#: ../lib/puppet/pops/issues.rb:591
+#: ../lib/puppet/pops/issues.rb:590
 msgid "Ambiguous EPP parameter expression. Probably missing '<%-' before parameters to remove leading whitespace"
 msgstr ""
 
 #. TRANSLATORS "import" is a function name and should not be translated
-#: ../lib/puppet/pops/issues.rb:596
+#: ../lib/puppet/pops/issues.rb:595
 msgid "Use of 'import' has been discontinued in favor of a manifest directory. See http://links.puppet.com/puppet-import-deprecation"
 msgstr ""
 
-#: ../lib/puppet/pops/issues.rb:600
+#: ../lib/puppet/pops/issues.rb:599
 msgid "This %{expression} has no effect. A value was produced and then forgotten (one or more preceding expressions may have the wrong form)"
 msgstr ""
 
-#: ../lib/puppet/pops/issues.rb:604
+#: ../lib/puppet/pops/issues.rb:603
 msgid "This expression is invalid. Did you try declaring a '%{name}' resource without a title?"
 msgstr ""
 
-#: ../lib/puppet/pops/issues.rb:608
+#: ../lib/puppet/pops/issues.rb:607
 msgid "This %{expression} has no effect. %{container} can not end with a value-producing expression without other effect"
 msgstr ""
 
-#: ../lib/puppet/pops/issues.rb:612
+#: ../lib/puppet/pops/issues.rb:611
 msgid "Use of reserved word: %{word}, must be quoted if intended to be a String value"
 msgstr ""
 
-#: ../lib/puppet/pops/issues.rb:616
+#: ../lib/puppet/pops/issues.rb:615
 msgid "Use of future reserved word: '%{word}'"
 msgstr ""
 
-#: ../lib/puppet/pops/issues.rb:620
+#: ../lib/puppet/pops/issues.rb:619
 msgid "The name: '%{name}' is already defined by Puppet and can not be used as the name of %{expression}."
 msgstr ""
 
-#: ../lib/puppet/pops/issues.rb:624
+#: ../lib/puppet/pops/issues.rb:623
 msgid "No matching entry for selector parameter with value '%{param}'"
 msgstr ""
 
-#: ../lib/puppet/pops/issues.rb:628
+#: ../lib/puppet/pops/issues.rb:627
 msgid "Node inheritance is not supported in Puppet >= 4.0.0. See http://links.puppet.com/puppet-node-inheritance-deprecation"
 msgstr ""
 
-#: ../lib/puppet/pops/issues.rb:632
+#: ../lib/puppet/pops/issues.rb:631
 msgid "Resource Override can only operate on resources, got: %{actual}"
 msgstr ""
 
-#: ../lib/puppet/pops/issues.rb:636
+#: ../lib/puppet/pops/issues.rb:635
 msgid "The parameter '%{param}' is declared more than once in the parameter list"
 msgstr ""
 
-#: ../lib/puppet/pops/issues.rb:640
+#: ../lib/puppet/pops/issues.rb:639
 msgid "The key '%{key}' is declared more than once"
 msgstr ""
 
-#: ../lib/puppet/pops/issues.rb:644
+#: ../lib/puppet/pops/issues.rb:643
 msgid "This %{container} already has a 'default' entry - this is a duplicate"
 msgstr ""
 
-#: ../lib/puppet/pops/issues.rb:648
+#: ../lib/puppet/pops/issues.rb:647
 msgid "The parameter $%{param} redefines a built in parameter in %{container}"
 msgstr ""
 
-#: ../lib/puppet/pops/issues.rb:652
+#: ../lib/puppet/pops/issues.rb:651
 msgid "Expected value of type %{expected}, got %{actual}"
 msgstr ""
 
-#: ../lib/puppet/pops/issues.rb:656
+#: ../lib/puppet/pops/issues.rb:655
 msgid "Unfolding of attributes from Hash can only be used once per resource body"
 msgstr ""
 
-#: ../lib/puppet/pops/issues.rb:660
+#: ../lib/puppet/pops/issues.rb:659
 msgid "This %{expression} appears in a context where catalog related expressions are not allowed"
 msgstr ""
 
-#: ../lib/puppet/pops/issues.rb:664
+#: ../lib/puppet/pops/issues.rb:663
 msgid "Syntax error at %{location}"
 msgstr ""
 
-#: ../lib/puppet/pops/issues.rb:668
+#: ../lib/puppet/pops/issues.rb:667
 msgid "Illegal class reference"
 msgstr ""
 
-#: ../lib/puppet/pops/issues.rb:672
+#: ../lib/puppet/pops/issues.rb:671
 msgid "Illegal fully qualified class reference"
 msgstr ""
 
-#: ../lib/puppet/pops/issues.rb:676
+#: ../lib/puppet/pops/issues.rb:675
 msgid "Illegal fully qualified name"
 msgstr ""
 
-#: ../lib/puppet/pops/issues.rb:680
+#: ../lib/puppet/pops/issues.rb:679
 msgid "Illegal name or bare word"
 msgstr ""
 
-#: ../lib/puppet/pops/issues.rb:684
+#: ../lib/puppet/pops/issues.rb:683
 msgid "Illegal number '%{value}'"
 msgstr ""
 
-#: ../lib/puppet/pops/issues.rb:688
+#: ../lib/puppet/pops/issues.rb:687
 msgid "Unicode escape '\\u' was not followed by 4 hex digits or 1-6 hex digits in {} or was > 10ffff"
 msgstr ""
 
-#: ../lib/puppet/pops/issues.rb:692
+#: ../lib/puppet/pops/issues.rb:691
 msgid "Not a valid hex number %{value}"
 msgstr ""
 
-#: ../lib/puppet/pops/issues.rb:696
+#: ../lib/puppet/pops/issues.rb:695
 msgid "Not a valid octal number %{value}"
 msgstr ""
 
-#: ../lib/puppet/pops/issues.rb:700
+#: ../lib/puppet/pops/issues.rb:699
 msgid "Not a valid decimal number %{value}"
 msgstr ""
 
-#: ../lib/puppet/pops/issues.rb:704
+#: ../lib/puppet/pops/issues.rb:703
 msgid "Internal Error: No string or file given to lexer to process."
 msgstr ""
 
-#: ../lib/puppet/pops/issues.rb:708
+#: ../lib/puppet/pops/issues.rb:707
 msgid "Unrecognized escape sequence '\\%{ch}'"
 msgstr ""
 
-#: ../lib/puppet/pops/issues.rb:712
+#: ../lib/puppet/pops/issues.rb:711
 msgid "Unclosed quote after %{after} followed by '%{followed_by}'"
 msgstr ""
 
-#: ../lib/puppet/pops/issues.rb:716
+#: ../lib/puppet/pops/issues.rb:715
 msgid "Unclosed multiline comment"
 msgstr ""
 
-#: ../lib/puppet/pops/issues.rb:720
+#: ../lib/puppet/pops/issues.rb:719
 msgid "Internal error: %{error}"
 msgstr ""
 
-#: ../lib/puppet/pops/issues.rb:724
+#: ../lib/puppet/pops/issues.rb:723
 msgid "Unbalanced epp tag, reached <eof> without closing tag."
 msgstr ""
 
-#: ../lib/puppet/pops/issues.rb:728
+#: ../lib/puppet/pops/issues.rb:727
 msgid "Reaching end after opening <%# without seeing %>"
 msgstr ""
 
-#: ../lib/puppet/pops/issues.rb:732
+#: ../lib/puppet/pops/issues.rb:731
 msgid "Unbalanced embedded expression - opening <% and reaching end of input"
 msgstr ""
 
-#: ../lib/puppet/pops/issues.rb:736
+#: ../lib/puppet/pops/issues.rb:735
 msgid "Unclosed parenthesis after '@(' followed by '%{followed_by}'"
 msgstr ""
 
-#: ../lib/puppet/pops/issues.rb:740
+#: ../lib/puppet/pops/issues.rb:739
 msgid "Heredoc without end-tagged line"
 msgstr ""
 
-#: ../lib/puppet/pops/issues.rb:744
+#: ../lib/puppet/pops/issues.rb:743
 msgid "Invalid heredoc escape char. Only t, r, n, s,  u, L, $ allowed. Got '%{actual}'"
 msgstr ""
 
-#: ../lib/puppet/pops/issues.rb:748
+#: ../lib/puppet/pops/issues.rb:747
 msgid "Invalid syntax in heredoc expected @(endtag[:syntax][/escapes])"
 msgstr ""
 
-#: ../lib/puppet/pops/issues.rb:752
+#: ../lib/puppet/pops/issues.rb:751
 msgid "Heredoc without any following lines of text"
 msgstr ""
 
-#: ../lib/puppet/pops/issues.rb:756
+#: ../lib/puppet/pops/issues.rb:755
 msgid "Heredoc with an empty endtag"
 msgstr ""
 
-#: ../lib/puppet/pops/issues.rb:760
+#: ../lib/puppet/pops/issues.rb:759
 msgid "An escape char for @() may only appear once. Got '%{escapes}'"
 msgstr ""
 
-#: ../lib/puppet/pops/issues.rb:764
+#: ../lib/puppet/pops/issues.rb:763
 msgid "Illegal %{format} Byte Order mark at beginning of input: %{bom} - remove these from the puppet source"
 msgstr ""
 
-#: ../lib/puppet/pops/issues.rb:768
+#: ../lib/puppet/pops/issues.rb:767
 msgid "No such file or directory: %{file}"
 msgstr ""
 
-#: ../lib/puppet/pops/issues.rb:772
+#: ../lib/puppet/pops/issues.rb:771
 msgid "%{file} is not a file"
 msgstr ""
 
-#: ../lib/puppet/pops/issues.rb:777
+#: ../lib/puppet/pops/issues.rb:776
 msgid "%{expression} resulted in a value outside of Puppet Integer max range, got '%{value}'"
 msgstr ""
 
-#: ../lib/puppet/pops/issues.rb:779
+#: ../lib/puppet/pops/issues.rb:778
 msgid "%{expression} resulted in a value outside of Puppet Integer min range, got '%{value}'"
 msgstr ""
 
-#: ../lib/puppet/pops/issues.rb:784
+#: ../lib/puppet/pops/issues.rb:783
 msgid "This runtime does not support hiera.yaml version %{version}"
 msgstr ""
 
-#: ../lib/puppet/pops/issues.rb:788
+#: ../lib/puppet/pops/issues.rb:787
 msgid "hiera.yaml version 3 cannot be used in %{location}"
 msgstr ""
 
-#: ../lib/puppet/pops/issues.rb:792
+#: ../lib/puppet/pops/issues.rb:791
 msgid "hiera.yaml version 4 cannot be used in the global layer"
 msgstr ""
 
-#: ../lib/puppet/pops/issues.rb:796
+#: ../lib/puppet/pops/issues.rb:795
 msgid "Undefined variable '%{name}'"
 msgstr ""
 
-#: ../lib/puppet/pops/issues.rb:800
+#: ../lib/puppet/pops/issues.rb:799
 msgid "Backend '%{name}' is defined more than once."
 msgstr ""
 
-#: ../lib/puppet/pops/issues.rb:803 ../lib/puppet/pops/issues.rb:816
+#: ../lib/puppet/pops/issues.rb:802 ../lib/puppet/pops/issues.rb:815
 msgid "First defined at %{error_location}"
 msgstr ""
 
-#: ../lib/puppet/pops/issues.rb:809
+#: ../lib/puppet/pops/issues.rb:808
 msgid "No data provider is registered for backend '%{name}'"
 msgstr ""
 
-#: ../lib/puppet/pops/issues.rb:813
+#: ../lib/puppet/pops/issues.rb:812
 msgid "Hierarchy name '%{name}' defined more than once."
 msgstr ""
 
-#: ../lib/puppet/pops/issues.rb:822
+#: ../lib/puppet/pops/issues.rb:821
 msgid "'hiera3_backend' is only allowed in the global layer"
 msgstr ""
 
-#: ../lib/puppet/pops/issues.rb:826
+#: ../lib/puppet/pops/issues.rb:825
 msgid "'default_hierarchy' is only allowed in the module layer"
 msgstr ""
 
-#: ../lib/puppet/pops/issues.rb:830
+#: ../lib/puppet/pops/issues.rb:829
 msgid "Use \"data_hash: %{function_name}_data\" instead of \"hiera3_backend: %{function_name}\""
 msgstr ""
 
-#: ../lib/puppet/pops/issues.rb:834
+#: ../lib/puppet/pops/issues.rb:833
 msgid "One of %{keys} must be defined in hierarchy '%{name}'"
 msgstr ""
 
-#: ../lib/puppet/pops/issues.rb:838 ../lib/puppet/pops/issues.rb:846
+#: ../lib/puppet/pops/issues.rb:837 ../lib/puppet/pops/issues.rb:845
 msgid "Only one of %{keys} can be defined in hierarchy '%{name}'"
 msgstr ""
 
-#: ../lib/puppet/pops/issues.rb:842
+#: ../lib/puppet/pops/issues.rb:841
 msgid "Only one of %{keys} can be defined in defaults"
 msgstr ""
 
-#: ../lib/puppet/pops/issues.rb:850
+#: ../lib/puppet/pops/issues.rb:849
 msgid "Option key '%{key}' used in hierarchy '%{name}' is reserved by Puppet"
 msgstr ""
 
-#: ../lib/puppet/pops/issues.rb:854
+#: ../lib/puppet/pops/issues.rb:853
 msgid "Option key '%{key}' used in defaults is reserved by Puppet"
 msgstr ""
 
-#: ../lib/puppet/pops/issues.rb:858
+#: ../lib/puppet/pops/issues.rb:857
 msgid "Unable to find '%{function_type}' function named '%{function_name}'"
 msgstr ""
 
-#: ../lib/puppet/pops/issues.rb:862
+#: ../lib/puppet/pops/issues.rb:861
 msgid "'alias' interpolation is only permitted if the expression is equal to the entire string"
 msgstr ""
 
-#: ../lib/puppet/pops/issues.rb:866
+#: ../lib/puppet/pops/issues.rb:865
 msgid "Unknown interpolation method '%{name}'"
 msgstr ""
 
-#: ../lib/puppet/pops/issues.rb:870
+#: ../lib/puppet/pops/issues.rb:869
 msgid "Interpolation using method syntax is not allowed in this context"
 msgstr ""
 
-#: ../lib/puppet/pops/issues.rb:874
+#: ../lib/puppet/pops/issues.rb:873
 msgid "Endless recursion detected when attempting to serialize value of class %{type_name}"
 msgstr ""
 
-#: ../lib/puppet/pops/issues.rb:878
+#: ../lib/puppet/pops/issues.rb:877
 msgid "%{path} contains the special value default. It will be converted to the String 'default'"
 msgstr ""
 
-#: ../lib/puppet/pops/issues.rb:882
+#: ../lib/puppet/pops/issues.rb:881
 msgid "%{path} contains %{klass} value. It will be converted to the String '%{value}'"
 msgstr ""
 
-#: ../lib/puppet/pops/issues.rb:886
+#: ../lib/puppet/pops/issues.rb:885
 msgid "%{path} contains a hash with %{klass} key. It will be converted to the String '%{value}'"
 msgstr ""
 
-#: ../lib/puppet/pops/issues.rb:890
+#: ../lib/puppet/pops/issues.rb:889
 msgid "The feature '%{feature}' is only available when compiling a catalog"
 msgstr ""
 
-#: ../lib/puppet/pops/issues.rb:894
+#: ../lib/puppet/pops/issues.rb:893
 msgid "The catalog operation '%{operation}' is only available when compiling a catalog"
 msgstr ""
 
-#: ../lib/puppet/pops/issues.rb:898
+#: ../lib/puppet/pops/issues.rb:897
 msgid "%{expr} is only available when compiling a catalog"
 msgstr ""
 
-#: ../lib/puppet/pops/issues.rb:902
+#: ../lib/puppet/pops/issues.rb:901
 msgid "The task operation '%{operation}' is not available when compiling a catalog"
 msgstr ""
 
-#: ../lib/puppet/pops/issues.rb:906
+#: ../lib/puppet/pops/issues.rb:905
 msgid "%{expr} is not available when compiling a catalog"
 msgstr ""
 
-#: ../lib/puppet/pops/issues.rb:910
+#: ../lib/puppet/pops/issues.rb:909
 msgid "The 'bolt' library is required to %{action}"
 msgstr ""
 
-#: ../lib/puppet/pops/issues.rb:914
+#: ../lib/puppet/pops/issues.rb:913
 msgid "Task not found: %{type_name}"
 msgstr ""
 
-#: ../lib/puppet/pops/issues.rb:918
+#: ../lib/puppet/pops/issues.rb:917
 msgid "Failed to load: %{type_name}"
 msgstr ""
 
@@ -5626,19 +5622,23 @@ msgstr ""
 msgid "The code loaded from %{source_ref} did not produce a Function class when evaluated. Got '%{klass}'"
 msgstr ""
 
-#: ../lib/puppet/pops/loader/ruby_legacy_function_instantiator.rb:17
+#: ../lib/puppet/pops/loader/ruby_legacy_function_instantiator.rb:24
 msgid "The code loaded from %{source_ref} does not seem to be a Puppet 3x API function - no 'newfunction' call."
 msgstr ""
 
-#. TRANSLATORS - the word 'newfunction' shoud not be translated as it is a method name.
-#: ../lib/puppet/pops/loader/ruby_legacy_function_instantiator.rb:37
+#. TRANSLATORS - the word 'newfunction' should not be translated as it is a method name.
+#: ../lib/puppet/pops/loader/ruby_legacy_function_instantiator.rb:46
 msgid "Illegal legacy function definition! The code loaded from %{source_ref} did not return the result of calling 'newfunction'. Got '%{klass}'"
 msgstr ""
 
-#: ../lib/puppet/pops/loader/ruby_legacy_function_instantiator.rb:40
+#: ../lib/puppet/pops/loader/ruby_legacy_function_instantiator.rb:49
 msgid "The code loaded from %{source_ref} produced mis-matched name, expected 'function_%{type_name}', got '%{created_name}'"
 msgstr ""
 
+#: ../lib/puppet/pops/loader/ruby_legacy_function_instantiator.rb:92
+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
 msgid "Failed to load metadata for task %{name}: %{reason}"
 msgstr ""
@@ -6716,39 +6716,39 @@ msgstr ""
 msgid "Refusing to install package group %{resource_name}, because allow_virtual is false."
 msgstr ""
 
-#: ../lib/puppet/provider/package/pkg.rb:46 ../lib/puppet/provider/package/pkg.rb:56
+#: ../lib/puppet/provider/package/pkg.rb:55 ../lib/puppet/provider/package/pkg.rb:65
 msgid "Unknown format %{resource_name}: %{full_flags}[%{bad_flag}]"
 msgstr ""
 
-#: ../lib/puppet/provider/package/pkg.rb:87
+#: ../lib/puppet/provider/package/pkg.rb:96
 msgid "Unknown format %{resource_name}: %{state}"
 msgstr ""
 
-#: ../lib/puppet/provider/package/pkg.rb:106
+#: ../lib/puppet/provider/package/pkg.rb:115
 msgid "Unknown line format %{resource_name}: %{parse_line}"
 msgstr ""
 
-#: ../lib/puppet/provider/package/pkg.rb:116
+#: ../lib/puppet/provider/package/pkg.rb:125
 msgid "Unable to unfreeze %{package}"
 msgstr ""
 
-#: ../lib/puppet/provider/package/pkg.rb:151
+#: ../lib/puppet/provider/package/pkg.rb:160
 msgid "Implicit version %{should} has %{n} possible matches"
 msgstr ""
 
-#: ../lib/puppet/provider/package/pkg.rb:161
+#: ../lib/puppet/provider/package/pkg.rb:172
 msgid "Selecting version '%{version}' for implicit '%{should}'"
 msgstr ""
 
-#: ../lib/puppet/provider/package/pkg.rb:166
+#: ../lib/puppet/provider/package/pkg.rb:177
 msgid "No version of %{name} matching %{should} is installable, even though the package is currently installed"
 msgstr ""
 
-#: ../lib/puppet/provider/package/pkg.rb:185
+#: ../lib/puppet/provider/package/pkg.rb:196
 msgid "pkg warning: %{warnings}"
 msgstr ""
 
-#: ../lib/puppet/provider/package/pkg.rb:221 ../lib/puppet/provider/package/pkg.rb:241
+#: ../lib/puppet/provider/package/pkg.rb:237 ../lib/puppet/provider/package/pkg.rb:257
 msgid "Unable to update %{package}"
 msgstr ""
 
@@ -6784,11 +6784,11 @@ msgstr ""
 msgid "Package not in pkgutil catalog: %{package}"
 msgstr ""
 
-#: ../lib/puppet/provider/package/portage.rb:215
+#: ../lib/puppet/provider/package/portage.rb:226
 msgid "No package found with the specified name [%{name}]"
 msgstr ""
 
-#: ../lib/puppet/provider/package/portage.rb:219
+#: ../lib/puppet/provider/package/portage.rb:230
 msgid "More than one package with the specified name [%{search_value}], please use the category parameter to disambiguate"
 msgstr ""
 
@@ -7195,7 +7195,7 @@ msgstr ""
 msgid "Could not find resource %{resource} when converting %{message} resources"
 msgstr ""
 
-#: ../lib/puppet/resource/status.rb:139 ../lib/puppet/transaction.rb:264
+#: ../lib/puppet/resource/status.rb:139 ../lib/puppet/transaction.rb:266
 msgid "Could not evaluate: %{detail}"
 msgstr ""
 
@@ -7339,53 +7339,57 @@ msgstr ""
 msgid "Using --configprint is deprecated. Use 'puppet config <subcommand>' instead."
 msgstr ""
 
-#: ../lib/puppet/settings.rb:695
+#: ../lib/puppet/settings.rb:599
+msgid "Could not load %{file}: %{detail}"
+msgstr ""
+
+#: ../lib/puppet/settings.rb:700
 msgid "Invalid setting type '%{type}'"
 msgstr ""
 
-#: ../lib/puppet/settings.rb:839
+#: ../lib/puppet/settings.rb:844
 msgid "Unknown searchpath case: %{source_type} for the %{source} settings path element."
 msgstr ""
 
-#: ../lib/puppet/settings.rb:901
+#: ../lib/puppet/settings.rb:906
 msgid "setting definition for '%{name}' is not a hash!"
 msgstr ""
 
-#: ../lib/puppet/settings.rb:906
+#: ../lib/puppet/settings.rb:911
 msgid "Setting %{name} is already defined"
 msgstr ""
 
-#: ../lib/puppet/settings.rb:910
+#: ../lib/puppet/settings.rb:915
 msgid "Setting %{name} is already using short name '%{short}'"
 msgstr ""
 
-#: ../lib/puppet/settings.rb:1167
+#: ../lib/puppet/settings.rb:1172
 msgid "Setting %{name} is deprecated."
 msgstr ""
 
 #. TRANSLATORS 'puppet.conf' is a file name and should not be translated
-#: ../lib/puppet/settings.rb:1172
+#: ../lib/puppet/settings.rb:1177
 msgid "Setting %{name} is deprecated in puppet.conf."
 msgstr ""
 
-#: ../lib/puppet/settings.rb:1339
+#: ../lib/puppet/settings.rb:1344
 msgid "Error converting value for param '%{name}': %{detail}"
 msgstr ""
 
-#: ../lib/puppet/settings.rb:1363
+#: ../lib/puppet/settings.rb:1368
 msgid "Could not find value for %{expression}"
 msgstr ""
 
 #. TRANSLATORS '$environment' is a Puppet specific variable and should not be translated
-#: ../lib/puppet/settings.rb:1373
+#: ../lib/puppet/settings.rb:1378
 msgid "You cannot interpolate $environment within '%{setting_name}' when using directory environments."
 msgstr ""
 
-#: ../lib/puppet/settings.rb:1374
+#: ../lib/puppet/settings.rb:1379
 msgid "Its value will remain %{value}."
 msgstr ""
 
-#: ../lib/puppet/settings.rb:1405
+#: ../lib/puppet/settings.rb:1410
 msgid "Attempt to assign a value to unknown setting %{name}"
 msgstr ""
 
@@ -7823,64 +7827,64 @@ msgstr ""
 msgid "PP syntax checker: \"%{message}\""
 msgstr ""
 
-#: ../lib/puppet/transaction.rb:84
+#: ../lib/puppet/transaction.rb:86
 msgid "Some pre-run checks failed"
 msgstr ""
 
-#: ../lib/puppet/transaction.rb:100
+#: ../lib/puppet/transaction.rb:102
 msgid "Applying configuration version '%{version}'"
 msgstr ""
 
-#: ../lib/puppet/transaction.rb:123
+#: ../lib/puppet/transaction.rb:125
 msgid "Provider %{name} is not functional on this host"
 msgstr ""
 
-#: ../lib/puppet/transaction.rb:139
+#: ../lib/puppet/transaction.rb:141
 msgid "Could not find a suitable provider for %{type}"
 msgstr ""
 
-#: ../lib/puppet/transaction.rb:146
+#: ../lib/puppet/transaction.rb:148
 msgid "post_resource_eval failed for provider %{provider}"
 msgstr ""
 
-#: ../lib/puppet/transaction.rb:163
+#: ../lib/puppet/transaction.rb:165
 msgid "resource is part of a dependency cycle"
 msgstr ""
 
-#: ../lib/puppet/transaction.rb:165
+#: ../lib/puppet/transaction.rb:167
 msgid "One or more resource dependency cycles detected in graph"
 msgstr ""
 
-#: ../lib/puppet/transaction.rb:178
+#: ../lib/puppet/transaction.rb:180
 msgid "Somehow left a component in the relationship graph"
 msgstr ""
 
-#: ../lib/puppet/transaction.rb:180
+#: ../lib/puppet/transaction.rb:182
 msgid "Starting to evaluate the resource"
 msgstr ""
 
-#: ../lib/puppet/transaction.rb:182
+#: ../lib/puppet/transaction.rb:184
 msgid "Evaluated in %{seconds} seconds"
 msgstr ""
 
-#: ../lib/puppet/transaction.rb:295
+#: ../lib/puppet/transaction.rb:297
 msgid "Dependency %{dep} has failures: %{status}"
 msgstr ""
 
-#: ../lib/puppet/transaction.rb:315
+#: ../lib/puppet/transaction.rb:318
 msgid "Prefetch failed for %{type_name} provider '%{name}'"
 msgstr ""
 
 #. TRANSLATORS `prefetch` is a function name and should not be translated
-#: ../lib/puppet/transaction.rb:365
+#: ../lib/puppet/transaction.rb:363 ../lib/puppet/transaction.rb:366
 msgid "Could not prefetch %{type_name} provider '%{name}': %{detail}"
 msgstr ""
 
-#: ../lib/puppet/transaction.rb:394
+#: ../lib/puppet/transaction.rb:399
 msgid "Skipping because of failed dependencies"
 msgstr ""
 
-#: ../lib/puppet/transaction.rb:399
+#: ../lib/puppet/transaction.rb:404
 msgid "Skipping because provider prefetch failed"
 msgstr ""
 
@@ -7919,11 +7923,11 @@ msgid_plural "Triggered '%{callback}' from %{count} events"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../lib/puppet/transaction/event_manager.rb:154
+#: ../lib/puppet/transaction/event_manager.rb:157
 msgid "Failed to call %{callback}: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/transaction/event_manager.rb:164
+#: ../lib/puppet/transaction/event_manager.rb:176
 msgid "Would have triggered '%{callback}' from %{count} event"
 msgid_plural "Would have triggered '%{callback}' from %{count} events"
 msgstr[0] ""
@@ -8620,19 +8624,19 @@ msgstr ""
 msgid "Already a generated class named %{klassname}"
 msgstr ""
 
-#: ../lib/puppet/util/command_line.rb:67
+#: ../lib/puppet/util/command_line.rb:71
 msgid "Could not initialize global default settings"
 msgstr ""
 
-#: ../lib/puppet/util/command_line.rb:166
+#: ../lib/puppet/util/command_line.rb:169
 msgid "Error: Could not parse application options: invalid option: %{opt}"
 msgstr ""
 
-#: ../lib/puppet/util/command_line.rb:169
+#: ../lib/puppet/util/command_line.rb:172
 msgid "See 'puppet help' for help on available puppet subcommands"
 msgstr ""
 
-#: ../lib/puppet/util/command_line.rb:182
+#: ../lib/puppet/util/command_line.rb:185
 msgid "Error: Unknown Puppet subcommand '%{cmd}'"
 msgstr ""
 
@@ -9060,11 +9064,11 @@ msgstr ""
 msgid "Invalid syslog facility %{str}"
 msgstr ""
 
-#: ../lib/puppet/util/log/destinations.rb:75
+#: ../lib/puppet/util/log/destinations.rb:76
 msgid "Creating log directory %{dir}"
 msgstr ""
 
-#: ../lib/puppet/util/log/destinations.rb:101
+#: ../lib/puppet/util/log/destinations.rb:102
 msgid "Unable to set ownership to %{user}:%{group} for log file: %{path}"
 msgstr ""
 
@@ -9587,87 +9591,87 @@ msgstr ""
 msgid "Successfully resumed the %{service_name} service"
 msgstr ""
 
-#: ../lib/puppet/util/windows/service.rb:372
+#: ../lib/puppet/util/windows/service.rb:373
 msgid "Unknown Service state '%{current_state}' for '%{service_name}'"
 msgstr ""
 
-#: ../lib/puppet/util/windows/service.rb:389
+#: ../lib/puppet/util/windows/service.rb:391
 msgid "Unknown start type '%{start_type}' for '%{service_name}'"
 msgstr ""
 
-#: ../lib/puppet/util/windows/service.rb:404
+#: ../lib/puppet/util/windows/service.rb:406
 msgid "Unknown start type %{start_type}"
 msgstr ""
 
-#: ../lib/puppet/util/windows/service.rb:425
+#: ../lib/puppet/util/windows/service.rb:427
 msgid "Failed to update service configuration"
 msgstr ""
 
-#: ../lib/puppet/util/windows/service.rb:485
+#: ../lib/puppet/util/windows/service.rb:487
 msgid "Failed to fetch services"
 msgstr ""
 
-#: ../lib/puppet/util/windows/service.rb:534
+#: ../lib/puppet/util/windows/service.rb:536
 msgid "Failed to open a handle to the service"
 msgstr ""
 
-#: ../lib/puppet/util/windows/service.rb:551
+#: ../lib/puppet/util/windows/service.rb:553
 msgid "Failed to open a handle to the service control manager"
 msgstr ""
 
-#: ../lib/puppet/util/windows/service.rb:575
+#: ../lib/puppet/util/windows/service.rb:576
 msgid "The service is already in the %{final_state} state. No further work needs to be done."
 msgstr ""
 
-#: ../lib/puppet/util/windows/service.rb:587
+#: ../lib/puppet/util/windows/service.rb:588
 msgid "The service must be in one of the %{valid_initial_states} states to perform this transition. It is currently in the %{current_state} state."
 msgstr ""
 
-#: ../lib/puppet/util/windows/service.rb:598
+#: ../lib/puppet/util/windows/service.rb:599
 msgid "There is already a pending transition to the %{final_state} state for the %{service_name} service."
 msgstr ""
 
-#: ../lib/puppet/util/windows/service.rb:614
+#: ../lib/puppet/util/windows/service.rb:615
 msgid "The service is in the %{pending_state} state, which is an unsafe pending state."
 msgstr ""
 
-#: ../lib/puppet/util/windows/service.rb:619
+#: ../lib/puppet/util/windows/service.rb:620
 msgid "Transitioning the %{service_name} service from %{initial_state} to %{final_state}"
 msgstr ""
 
-#: ../lib/puppet/util/windows/service.rb:623
+#: ../lib/puppet/util/windows/service.rb:624
 msgid "Waiting for the transition to finish"
 msgstr ""
 
-#: ../lib/puppet/util/windows/service.rb:627
+#: ../lib/puppet/util/windows/service.rb:629
 msgid "Failed to transition the %{service_name} service to the %{final_state} state. Detail: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/util/windows/service.rb:666 ../lib/puppet/util/windows/service.rb:702
+#: ../lib/puppet/util/windows/service.rb:668 ../lib/puppet/util/windows/service.rb:704
 msgid "Service query failed"
 msgstr ""
 
-#: ../lib/puppet/util/windows/service.rb:719
+#: ../lib/puppet/util/windows/service.rb:721
 msgid "Failed to send the %{control_signal} signal to the service. Its current state is %{current_state}. Reason for failure:"
 msgstr ""
 
-#: ../lib/puppet/util/windows/service.rb:754
+#: ../lib/puppet/util/windows/service.rb:756
 msgid "The service transitioned to the %{pending_state} state."
 msgstr ""
 
-#: ../lib/puppet/util/windows/service.rb:764
+#: ../lib/puppet/util/windows/service.rb:770
 msgid "Timed out while waiting for the service to transition from %{initial_state} to %{final_state} OR from %{initial_state} to %{pending_state} to %{final_state}. The service's current state is %{current_state}."
 msgstr ""
 
-#: ../lib/puppet/util/windows/service.rb:779
+#: ../lib/puppet/util/windows/service.rb:785
 msgid "Waiting for the pending transition to the %{final_state} state to finish."
 msgstr ""
 
-#: ../lib/puppet/util/windows/service.rb:792
+#: ../lib/puppet/util/windows/service.rb:799
 msgid "Unexpected transition to the %{current_state} state while waiting for the pending transition from %{pending_state} to %{final_state} to finish."
 msgstr ""
 
-#: ../lib/puppet/util/windows/service.rb:806
+#: ../lib/puppet/util/windows/service.rb:813
 msgid "Timed out while waiting for the pending transition from %{pending_state} to %{final_state} to finish. The current state is %{current_state}."
 msgstr ""