puppet 5.0.0 → 5.0.1

data/lib/puppet/parser/functions/find_file.rb

@@ -23,6 +23,6 @@ The function returns `undef` if none of the given paths were found
 - since 4.8.0
 DOC
 ) do |args|
-  Error.is4x('find_file')
+  Puppet::Parser::Functions::Error.is4x('find_file')
 end
 

data/lib/puppet/parser/functions/inline_epp.rb

@@ -47,5 +47,5 @@ END
 - Since 3.5
 - Requires [future parser](/puppet/3.8/reference/experiments_future.html) in Puppet 3.5 to 3.8") do |arguments|
 
-  Error.is4x('inline_epp')
+  Puppet::Parser::Functions::Error.is4x('inline_epp')
 end

data/lib/puppet/parser/functions/lest.rb

@@ -45,5 +45,5 @@ Would notice the value `20`
 * Since 4.5.0
 DOC
 ) do |args|
-  Error.is4x('lest')
+  Puppet::Parser::Functions::Error.is4x('lest')
 end

data/lib/puppet/parser/functions/map.rb

@@ -72,5 +72,5 @@ $transformed_data = $data.map |$key,$value| { $value }
 - Since 4.0.0
 DOC
 ) do |args|
-  Error.is4x('map')
+  Puppet::Parser::Functions::Error.is4x('map')
 end

data/lib/puppet/parser/functions/match.rb

@@ -39,5 +39,5 @@ $matches = ["abc123","def456"].match(/([a-z]+)([1-9]+)/)
 - Since 4.0.0
 DOC
 ) do |args|
-  Error.is4x('match')
+  Puppet::Parser::Functions::Error.is4x('match')
 end

data/lib/puppet/parser/functions/new.rb

@@ -934,6 +934,6 @@ $b = binary_file('mymodule/mypicture.jpg')
 
 DOC
 ) do |args|
-  Error.is4x('new')
+  Puppet::Parser::Functions::Error.is4x('new')
 end
 

data/lib/puppet/parser/functions/next.rb

@@ -34,5 +34,5 @@ Would notice the value `[10, 200, 30]`
 * Since 4.8.0
 DOC
 ) do |args|
-  Error.is4x('next')
+  Puppet::Parser::Functions::Error.is4x('next')
 end

data/lib/puppet/parser/functions/reduce.rb

@@ -102,5 +102,5 @@ $combine = $data.reduce( [d, 4] ) |$memo, $value| {
 - Since 4.0.0
 DOC
 ) do |args|
-  Error.is4x('reduce')
+  Puppet::Parser::Functions::Error.is4x('reduce')
 end

data/lib/puppet/parser/functions/return.rb

@@ -67,5 +67,5 @@ Note that the returned value is ignored if used in a class or user defined type.
 * Since 4.8.0
 DOC
 ) do |args|
-  Error.is4x('return')
+  Puppet::Parser::Functions::Error.is4x('return')
 end

data/lib/puppet/parser/functions/reverse_each.rb

@@ -4,7 +4,7 @@ Puppet::Parser::Functions::newfunction(
   :arity => -1,
   :doc => <<-DOC
 Reverses the order of the elements of something that is iterable and optionally runs a
-[lambda](http://docs.puppetlabs.com/puppet/latest/reference/lang_lambdas.html) for each
+[lambda](https://docs.puppetlabs.com/puppet/latest/reference/lang_lambdas.html) for each
 element.
 
 This function takes one to two arguments:
@@ -79,5 +79,5 @@ $transformed_data = map(reverse_each($data)) |$item| { $item * 10 }
 
 DOC
 ) do |args|
-  Error.is4x('reverse_each')
+  Puppet::Parser::Functions::Error.is4x('reverse_each')
 end

data/lib/puppet/parser/functions/slice.rb

@@ -35,5 +35,5 @@ to empty arrays for a hash.
 - Since 4.0.0
 DOC
 ) do |args|
-  Error.is4x('slice')
+  Puppet::Parser::Functions::Error.is4x('slice')
 end

data/lib/puppet/parser/functions/step.rb

@@ -4,7 +4,7 @@ Puppet::Parser::Functions::newfunction(
   :arity => -1,
   :doc => <<-DOC
 Provides stepping with given interval over elements in an iterable and optionally runs a
-[lambda](http://docs.puppetlabs.com/puppet/latest/reference/lang_lambdas.html) for each
+[lambda](https://docs.puppetlabs.com/puppet/latest/reference/lang_lambdas.html) for each
 element.
 
 This function takes two to three arguments:
@@ -80,5 +80,5 @@ $transformed_data contains [0,50,100,150,200]
 
 DOC
 ) do |args|
-  Error.is4x('step')
+  Puppet::Parser::Functions::Error.is4x('step')
 end

data/lib/puppet/parser/functions/strftime.rb

@@ -181,5 +181,5 @@ notice($duration.strftime('%M:%S')) # outputs '200:30'
 - Since 4.8.0
 DOC
 ) do |args|
-  Error.is4x('strftime')
+  Puppet::Parser::Functions::Error.is4x('strftime')
 end

data/lib/puppet/parser/functions/then.rb

@@ -69,5 +69,5 @@ was not a String.
 
 DOC
 ) do |args|
-  Error.is4x('then')
+  Puppet::Parser::Functions::Error.is4x('then')
 end

data/lib/puppet/parser/functions/type.rb

@@ -49,5 +49,5 @@ function type(Any $value, InferenceFidelity $fidelity = 'detailed') # returns Ty
 
 DOC
 ) do |args|
-  Error.is4x('type')
+  Puppet::Parser::Functions::Error.is4x('type')
 end

data/lib/puppet/parser/functions/with.rb

@@ -24,5 +24,5 @@ $check_var = $x
 - Since 4.0.0
 DOC
 ) do |args|
-  Error.is4x('with')
+  Puppet::Parser::Functions::Error.is4x('with')
 end

data/lib/puppet/pops/merge_strategy.rb

@@ -390,7 +390,7 @@ module Puppet::Pops
           'knockout_prefix=>Optional[String],'\
           'merge_debug=>Optional[Boolean],'\
           'merge_hash_arrays=>Optional[Boolean],'\
-          'sort_merge_arrays=>Optional[Boolean],'\
+          'sort_merged_arrays=>Optional[Boolean],'\
           '}]')
     end
 

data/lib/puppet/pops/time/timestamp.rb

@@ -1,8 +1,8 @@
 module Puppet::Pops
 module Time
 class Timestamp < TimeData
-  DEFAULT_FORMATS_WO_TZ = ['%FT%T.%N', '%FT%T', '%F']
-  DEFAULT_FORMATS = ['%FT%T.%N %Z', '%FT%T %Z', '%F %Z'] + DEFAULT_FORMATS_WO_TZ
+  DEFAULT_FORMATS_WO_TZ = ['%FT%T.%N', '%FT%T', '%F %T.%N', '%F %T', '%F']
+  DEFAULT_FORMATS = ['%FT%T.%N %Z', '%FT%T %Z', '%F %T.%N %Z', '%F %T %Z', '%F %Z'] + DEFAULT_FORMATS_WO_TZ
 
   CURRENT_TIMEZONE = 'current'.freeze
   KEY_TIMEZONE = 'timezone'.freeze

data/lib/puppet/provider/nameservice.rb

@@ -24,11 +24,13 @@ class Puppet::Provider::NameService < Puppet::Provider
 
     def instances
       objects = []
-      Puppet::Etc.send("set#{section}ent")
       begin
-        while ent = Puppet::Etc.send("get#{section}ent")
+        method = Puppet::Etc.method(:"get#{section}ent")
+        while ent = method.call
           objects << new(:name => ent.name, :canonical_name => ent.canonical_name, :ensure => :present)
         end
+      ensure
+        Puppet::Etc.send("end#{section}ent")
       end
       objects
     end

data/lib/puppet/reference/configuration.rb

@@ -75,7 +75,7 @@ config.header = <<EOT
 
 See the [configuration guide][confguide] for more details.
 
-[confguide]: http://docs.puppetlabs.com/puppet/latest/reference/config_about_settings.html
+[confguide]: https://docs.puppetlabs.com/puppet/latest/reference/config_about_settings.html
 
 * * *
 

data/lib/puppet/reports/http.rb

@@ -6,8 +6,10 @@ Puppet::Reports.register_report(:http) do
 
   desc <<-DESC
     Send reports via HTTP or HTTPS. This report processor submits reports as
-    POST requests to the address in the `reporturl` setting. The body of each POST
-    request is the YAML dump of a Puppet::Transaction::Report object, and the
+    POST requests to the address in the `reporturl` setting. When a HTTPS URL
+    is used, the remote server must present a certificate issued by the Puppet
+    CA or the connection will fail validation. The body of each POST request
+    is the YAML dump of a Puppet::Transaction::Report object, and the
     Content-Type is set as `application/x-yaml`.
   DESC
 

data/lib/puppet/resource/capability_finder.rb

@@ -95,7 +95,7 @@ module Puppet::Resource::CapabilityFinder
       end
 
       # The format of the response body is documented at
-      #   http://docs.puppetlabs.com/puppetdb/3.0/api/query/v4/resources.html#response-format
+      #   https://docs.puppetlabs.com/puppetdb/3.0/api/query/v4/resources.html#response-format
       unless result.is_a?(Array)
         raise Puppet::DevError,
         "Unexpected response from PuppetDB when looking up #{cap}: " \

data/lib/puppet/util/execution.rb

@@ -83,7 +83,7 @@ module Puppet::Util::Execution
     end
 
     if failonfail && exitstatus != 0
-      raise Puppet::ExecutionFailure, output
+      raise Puppet::ExecutionFailure, output.to_s
     end
 
     output

data/lib/puppet/util/logging.rb

@@ -155,6 +155,7 @@ module Logging
   FILE_AND_LINE = MM::TUPLE
   FILE_NO_LINE  = MM.new(MM::NOT_NIL, nil).freeze
   NO_FILE_LINE  = MM.new(nil, MM::NOT_NIL).freeze
+  SUPPRESS_FILE_LINE = MM.new(:default, :default).freeze
 
   # Logs a (non deprecation) warning once for a given key.
   #
@@ -162,12 +163,13 @@ module Logging
   #   kind must be one of the defined kinds for the Puppet[:disable_warnings] setting.
   # @param message [String] The message to log (logs via warning)
   # @param key [String] Key used to make this warning unique
-  # @param file [String,nil] the File related to the warning
-  # @param line [Integer,nil] the Line number related to the warning
+  # @param file [String,:default,nil] the File related to the warning
+  # @param line [Integer,:default,nil] the Line number related to the warning
   #   warning as unique
+  # @param level [Symbol] log level to use, defaults to :warning
   #
   # Either :file and :line and/or :key must be passed.
-  def warn_once(kind, key, message, file = nil, line = nil)
+  def warn_once(kind, key, message, file = nil, line = nil, level = :warning)
     return if Puppet[:disable_warnings].include?(kind)
     $unique_warnings ||= {}
     if $unique_warnings.length < 100 then
@@ -175,6 +177,8 @@ module Logging
         $unique_warnings[key] = message
         call_trace =
         case MM.new(file, line)
+        when SUPPRESS_FILE_LINE
+          ''
         when FILE_AND_LINE
           _("\n   (at %{file}:%{line})") % { file: file, line: line }
         when FILE_NO_LINE
@@ -184,7 +188,7 @@ module Logging
         else
           _("\n   (file & line not available)")
         end
-        warning("#{message}#{call_trace}")
+        send_log(level, "#{message}#{call_trace}")
       end
     end
   end

data/lib/puppet/vendor/semantic_puppet/lib/semantic_puppet/gem_version.rb

@@ -1,3 +1,3 @@
 module SemanticPuppet
-  VERSION = '1.0.0'
+  VERSION = '1.0.1'
 end

data/lib/puppet/vendor/semantic_puppet/lib/semantic_puppet/version.rb

@@ -30,7 +30,7 @@ module SemanticPuppet
         false
       else
         prerelease = match[4]
-        prerelease.nil? || prerelease.split('.').all? { |x| !(x =~ /^0\d+/) }
+        prerelease.nil? || prerelease.split('.').all? { |x| !(x =~ /^0\d+$/) }
       end
     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 = '5.0.0'
+  PUPPETVERSION = '5.0.1'
 
   ##
   # version is a public API method intended to always provide a fast and

data/locales/puppet.pot

@@ -6,11 +6,11 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Puppet automation framework 4.10.2-945-g545ce43\n"
+"Project-Id-Version: Puppet automation framework 5.0.0-77-g7f53ea2\n"
 "\n"
 "Report-Msgid-Bugs-To: https://tickets.puppetlabs.com\n"
-"POT-Creation-Date: 2017-06-15 22:59+0000\n"
-"PO-Revision-Date: 2017-06-15 22:59+0000\n"
+"POT-Creation-Date: 2017-07-14 22:07+0000\n"
+"PO-Revision-Date: 2017-07-14 22:07+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
@@ -305,7 +305,7 @@ msgstr ""
 msgid "Unknown rendering format '%{format}'"
 msgstr ""
 
-#: ../lib/puppet/application/lookup.rb:347 ../lib/puppet/face/epp.rb:489
+#: ../lib/puppet/application/lookup.rb:347 ../lib/puppet/face/epp.rb:491
 msgid "Incorrect formatted data in %{fact_file} given via the --facts flag"
 msgstr ""
 
@@ -811,27 +811,27 @@ msgstr ""
 msgid "Whether or not to show a file name header between rendered results."
 msgstr ""
 
-#: ../lib/puppet/face/epp.rb:331
+#: ../lib/puppet/face/epp.rb:332
 msgid "No input to process given on command line or stdin"
 msgstr ""
 
-#: ../lib/puppet/face/epp.rb:345
+#: ../lib/puppet/face/epp.rb:346
 msgid "error while rendering epp"
 msgstr ""
 
-#: ../lib/puppet/face/epp.rb:384
+#: ../lib/puppet/face/epp.rb:386
 msgid "Only .yaml or .pp can be used as a --values_file"
 msgstr ""
 
-#: ../lib/puppet/face/epp.rb:387
+#: ../lib/puppet/face/epp.rb:389
 msgid "Could not load --values_file %{error}"
 msgstr ""
 
-#: ../lib/puppet/face/epp.rb:390
+#: ../lib/puppet/face/epp.rb:392
 msgid "--values_file option must evaluate to a Hash or undef/nil, got: '%{template_class}'"
 msgstr ""
 
-#: ../lib/puppet/face/epp.rb:403
+#: ../lib/puppet/face/epp.rb:405
 msgid "--values option must evaluate to a Hash or undef, got: '%{values_class}'"
 msgstr ""
 
@@ -1713,15 +1713,15 @@ msgstr ""
 msgid "The current user does not have the necessary permission to manage symlinks."
 msgstr ""
 
-#: ../lib/puppet/forge.rb:200
+#: ../lib/puppet/forge.rb:201
 msgid "Downloaded release for %{name} did not match expected checksum"
 msgstr ""
 
-#: ../lib/puppet/forge.rb:208 ../lib/puppet/module_tool/applications/unpacker.rb:58 ../lib/puppet/module_tool/local_tarball.rb:86
+#: ../lib/puppet/forge.rb:209 ../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:221
+#: ../lib/puppet/forge.rb:222
 msgid "Cannot consider release %{name}-%{version}: %{error}"
 msgstr ""
 
@@ -2494,6 +2494,14 @@ msgstr ""
 msgid "The file %{f} does not exist"
 msgstr ""
 
+#: ../lib/puppet/module.rb:66
+msgid "VersionRanges will never be strict when using non-vendored SemanticPuppet gem, version %{version}"
+msgstr ""
+
+#: ../lib/puppet/module.rb:72
+msgid "VersionRanges will always be strict when using non-vendored SemanticPuppet gem, version %{version}"
+msgstr ""
+
 #: ../lib/puppet/module_tool.rb:37
 msgid "Not a valid full name: %{full_module_name}"
 msgstr ""
@@ -3362,125 +3370,125 @@ msgstr ""
 msgid "Application instances like '%{resource}' can only be contained within a Site"
 msgstr ""
 
-#: ../lib/puppet/parser/compiler.rb:149
+#: ../lib/puppet/parser/compiler.rb:153
 msgid "For compiling %{node}"
 msgstr ""
 
-#: ../lib/puppet/parser/compiler.rb:153
+#: ../lib/puppet/parser/compiler.rb:157
 msgid "Compile: Set node parameters"
 msgstr ""
 
-#: ../lib/puppet/parser/compiler.rb:155
+#: ../lib/puppet/parser/compiler.rb:159
 msgid "Compile: Created settings scope"
 msgstr ""
 
-#: ../lib/puppet/parser/compiler.rb:157
+#: ../lib/puppet/parser/compiler.rb:161
 msgid "Compile: Evaluated capability mappings"
 msgstr ""
 
 #. TRANSLATORS "main" is a function name and should not be translated
-#: ../lib/puppet/parser/compiler.rb:160
+#: ../lib/puppet/parser/compiler.rb:164
 msgid "Compile: Evaluated main"
 msgstr ""
 
-#: ../lib/puppet/parser/compiler.rb:162
+#: ../lib/puppet/parser/compiler.rb:166
 msgid "Compile: Evaluated site"
 msgstr ""
 
-#: ../lib/puppet/parser/compiler.rb:164
+#: ../lib/puppet/parser/compiler.rb:168
 msgid "Compile: Evaluated AST node"
 msgstr ""
 
-#: ../lib/puppet/parser/compiler.rb:166
+#: ../lib/puppet/parser/compiler.rb:170
 msgid "Compile: Evaluated node classes"
 msgstr ""
 
-#: ../lib/puppet/parser/compiler.rb:168
+#: ../lib/puppet/parser/compiler.rb:172
 msgid "Compile: Evaluated application instances"
 msgstr ""
 
-#: ../lib/puppet/parser/compiler.rb:171
+#: ../lib/puppet/parser/compiler.rb:175
 msgid "Compile: Evaluated site capability mappings"
 msgstr ""
 
-#: ../lib/puppet/parser/compiler.rb:173
+#: ../lib/puppet/parser/compiler.rb:177
 msgid "Compile: Evaluated generators"
 msgstr ""
 
-#: ../lib/puppet/parser/compiler.rb:175
+#: ../lib/puppet/parser/compiler.rb:179
 msgid "Compile: Validate Catalog pre-finish"
 msgstr ""
 
-#: ../lib/puppet/parser/compiler.rb:179
+#: ../lib/puppet/parser/compiler.rb:183
 msgid "Compile: Finished catalog"
 msgstr ""
 
-#: ../lib/puppet/parser/compiler.rb:181
+#: ../lib/puppet/parser/compiler.rb:185
 msgid "Compile: Prune"
 msgstr ""
 
-#: ../lib/puppet/parser/compiler.rb:185
+#: ../lib/puppet/parser/compiler.rb:189
 msgid "Compile: Validate Catalog final"
 msgstr ""
 
-#: ../lib/puppet/parser/compiler.rb:315
+#: ../lib/puppet/parser/compiler.rb:319
 msgid "Invalid node mapping in %{app}: Mapping must be a hash"
 msgstr ""
 
-#: ../lib/puppet/parser/compiler.rb:318
+#: ../lib/puppet/parser/compiler.rb:322
 msgid "Invalid node mapping in %{app}: Key %{k} is not a Node"
 msgstr ""
 
-#: ../lib/puppet/parser/compiler.rb:318
+#: ../lib/puppet/parser/compiler.rb:322
 msgid "Node"
 msgstr ""
 
-#: ../lib/puppet/parser/compiler.rb:321
+#: ../lib/puppet/parser/compiler.rb:325
 msgid "Invalid node mapping in %{app}: Value %{res} is not a resource"
 msgstr ""
 
-#: ../lib/puppet/parser/compiler.rb:322
+#: ../lib/puppet/parser/compiler.rb:326
 msgid "Application %{app} maps component %{res} to multiple nodes"
 msgstr ""
 
-#: ../lib/puppet/parser/compiler.rb:367
+#: ../lib/puppet/parser/compiler.rb:371
 msgid "Could not find class %{name} for %{node}"
 msgstr ""
 
-#: ../lib/puppet/parser/compiler.rb:494
+#: ../lib/puppet/parser/compiler.rb:498
 msgid "Could not find node statement with name 'default' or '%{names}'"
 msgstr ""
 
-#: ../lib/puppet/parser/compiler.rb:515
+#: ../lib/puppet/parser/compiler.rb:519
 msgid "Evaluated collections"
 msgstr ""
 
-#: ../lib/puppet/parser/compiler.rb:530
+#: ../lib/puppet/parser/compiler.rb:534
 msgid "Evaluated definitions"
 msgstr ""
 
-#: ../lib/puppet/parser/compiler.rb:559
+#: ../lib/puppet/parser/compiler.rb:563
 msgid "Iterated (%{count}) on generators"
 msgstr ""
 
-#: ../lib/puppet/parser/compiler.rb:570
+#: ../lib/puppet/parser/compiler.rb:574
 msgid "Somehow looped more than 1000 times while evaluating host catalog"
 msgstr ""
 
-#: ../lib/puppet/parser/compiler.rb:601
+#: ../lib/puppet/parser/compiler.rb:605
 msgid "Could not find resource(s) %{resources} for overriding"
 msgstr ""
 
-#: ../lib/puppet/parser/compiler.rb:612
+#: ../lib/puppet/parser/compiler.rb:616
 msgid "Failed to realize virtual resources %{resources}"
 msgstr ""
 
 #. TRANSLATORS "main" is a function name and should not be translated
-#: ../lib/puppet/parser/compiler.rb:642
+#: ../lib/puppet/parser/compiler.rb:646
 msgid "Couldn't find main"
 msgstr ""
 
-#: ../lib/puppet/parser/compiler.rb:714
+#: ../lib/puppet/parser/compiler.rb:718
 msgid "For initializing compiler"
 msgstr ""
 
@@ -4879,19 +4887,19 @@ msgstr ""
 msgid "Empty key in string 'i'?"
 msgstr ""
 
-#: ../lib/puppet/provider/aixobject.rb:312 ../lib/puppet/provider/nameservice.rb:164
+#: ../lib/puppet/provider/aixobject.rb:312 ../lib/puppet/provider/nameservice.rb:166
 msgid "already exists"
 msgstr ""
 
-#: ../lib/puppet/provider/aixobject.rb:320 ../lib/puppet/provider/nameservice.rb:175 ../lib/puppet/provider/nameservice/directoryservice.rb:420
+#: ../lib/puppet/provider/aixobject.rb:320 ../lib/puppet/provider/nameservice.rb:177 ../lib/puppet/provider/nameservice/directoryservice.rb:420
 msgid "Could not create %{resource} %{name}: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/provider/aixobject.rb:327 ../lib/puppet/provider/nameservice.rb:181
+#: ../lib/puppet/provider/aixobject.rb:327 ../lib/puppet/provider/nameservice.rb:183
 msgid "already absent"
 msgstr ""
 
-#: ../lib/puppet/provider/aixobject.rb:335 ../lib/puppet/provider/nameservice.rb:189
+#: ../lib/puppet/provider/aixobject.rb:335 ../lib/puppet/provider/nameservice.rb:191
 msgid "Could not delete %{resource} %{name}: %{detail}"
 msgstr ""
 
@@ -4899,7 +4907,7 @@ msgstr ""
 msgid "Trying to update parameter '%{param}' to '%{value}' for a resource that does not exists %{resource} %{name}: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/provider/aixobject.rb:379 ../lib/puppet/provider/group/aix.rb:130 ../lib/puppet/provider/nameservice.rb:296 ../lib/puppet/provider/nameservice/directoryservice.rb:336 ../lib/puppet/provider/nameservice/directoryservice.rb:365
+#: ../lib/puppet/provider/aixobject.rb:379 ../lib/puppet/provider/group/aix.rb:130 ../lib/puppet/provider/nameservice.rb:298 ../lib/puppet/provider/nameservice/directoryservice.rb:336 ../lib/puppet/provider/nameservice/directoryservice.rb:365
 msgid "Could not set %{param} on %{resource}[%{name}]: %{detail}"
 msgstr ""
 
@@ -5150,11 +5158,11 @@ msgstr ""
 msgid "Could not parse configuration for %{resource}: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/provider/nameservice.rb:56
+#: ../lib/puppet/provider/nameservice.rb:58
 msgid "listbyname is deprecated and will be removed in a future release of Puppet. Please use `self.instances` to obtain a list of users."
 msgstr ""
 
-#: ../lib/puppet/provider/nameservice.rb:99
+#: ../lib/puppet/provider/nameservice.rb:101
 msgid "Invalid value %{value}: %{error}"
 msgstr ""
 
@@ -5618,7 +5626,7 @@ msgstr ""
 msgid "No docs for %{type}[%{sname}]"
 msgstr ""
 
-#: ../lib/puppet/reports/http.rb:32
+#: ../lib/puppet/reports/http.rb:34
 msgid "Unable to submit report to %{url} [%{code}] %{message}"
 msgstr ""
 
@@ -6950,7 +6958,7 @@ msgstr ""
 msgid "Failed to convert '%{path}' to URI: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/util.rb:660
+#: ../lib/puppet/util.rb:678
 msgid "Could not %{message}: %{err}"
 msgstr ""
 
@@ -7398,36 +7406,36 @@ msgstr ""
 msgid "Wrapped exception:"
 msgstr ""
 
-#: ../lib/puppet/util/logging.rb:179
+#: ../lib/puppet/util/logging.rb:183
 msgid ""
 "\n"
 "   (at %{file}:%{line})"
 msgstr ""
 
-#: ../lib/puppet/util/logging.rb:181
+#: ../lib/puppet/util/logging.rb:185
 msgid ""
 "\n"
 "   (in %{file})"
 msgstr ""
 
-#: ../lib/puppet/util/logging.rb:183
+#: ../lib/puppet/util/logging.rb:187
 msgid ""
 "\n"
 "   (in unknown file, line %{line})"
 msgstr ""
 
-#: ../lib/puppet/util/logging.rb:185
+#: ../lib/puppet/util/logging.rb:189
 msgid ""
 "\n"
 "   (file & line not available)"
 msgstr ""
 
-#: ../lib/puppet/util/logging.rb:283
+#: ../lib/puppet/util/logging.rb:287
 msgid "unknown"
 msgstr ""
 
 #. TRANSLATORS error message with origin location
-#: ../lib/puppet/util/logging.rb:288
+#: ../lib/puppet/util/logging.rb:292
 msgid ""
 "%{message}\n"
 "   (at %{call_trace})"