puppet 5.5.12-universal-darwin → 5.5.13-universal-darwin

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f7d275f3e54065ce738692dd8de52fd68eaaf0de535658d29a4e7b8a21a5f94d
-  data.tar.gz: dd1fba644835a9bc2537f47f46e8bc42a7c56d3743a2e29732ba54d4fd6f8a52
+  metadata.gz: 20f8944352fa7ab8227fad5112fcd7b0d0ddcfc0fd92f807927fa5730c09efcd
+  data.tar.gz: 996de40d490c39de961fb78a0a77436819f3506bed784cac845782ddaaf46d7c
 SHA512:
-  metadata.gz: 62bbb0a43de279e36f0daff86fa46359c7cf0df95e01979a732eeb6454d0debc345df591601c171e112c4e7bbc68c23795abb60b1672f209042c6ec7400a15f0
-  data.tar.gz: 8b236204d49b8f88c801b9387767010e73288ef143d0139b058e72b7839b5b9382212d40a3c69f17812498079efdc842bdecf4e9f3483e4c475a267a4d312ea1
+  metadata.gz: f03c1a82d05f0bb423bd26a8285e505893717954781447067cd4795f94e299a6666b998a8fe2779c44549ec90d082c92f0ca809f66f3a6f56f965f334fab8afb
+  data.tar.gz: e164bf2bad9983abbb2f6bd3f99bd278d131d6d74e4e7aa6f1fcbe4b491830b091c073fd7d58729a67401542f723ed46d5110888fb309dc2ede3a94b5d8552cb

data/Gemfile

@@ -47,11 +47,6 @@ group(:development, :test) do
   gem "rspec-collection_matchers", "~> 1.1", :require => false
   gem "rspec-legacy_formatters", "~> 1.0", :require => false
 
-  # Mocha is not compatible across minor version changes; because of this only
-  # versions matching ~> 0.10.5 are supported. All other versions are unsupported
-  # and can be expected to fail.
-  gem "mocha", "~> 0.10.5", :require => false
-
   gem "yarjuf", "~> 2.0"
 
   # json-schema does not support windows, so omit it from the platforms list

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    puppet (5.5.12)
+    puppet (5.5.13)
       CFPropertyList (~> 2.2)
       facter (>= 2.4.0, < 4)
       fast_gettext (~> 1.1.2)
@@ -43,10 +43,10 @@ GEM
     json-schema (2.8.1)
       addressable (>= 2.4)
     locale (2.1.2)
-    memory_profiler (0.9.12)
+    memory_profiler (0.9.13)
     metaclass (0.0.4)
     method_source (0.9.2)
-    mocha (0.10.5)
+    mocha (1.8.0)
       metaclass (~> 0.0.1)
     msgpack (1.2.9)
     multi_json (1.13.1)
@@ -56,9 +56,10 @@ GEM
     packaging (0.99.24)
       artifactory (~> 2)
       rake (~> 12.3)
-    parallel (1.14.0)
+    parallel (1.16.2)
     parser (2.6.2.0)
       ast (~> 2.4.0)
+    pathspec (0.2.1)
     powerpack (0.1.2)
     pry (0.12.2)
       coderay (~> 1.1.0)
@@ -66,12 +67,12 @@ GEM
     puppet-lint (2.3.6)
     puppet-syntax (2.4.3)
       rake
-    puppetlabs_spec_helper (1.1.1)
-      mocha
-      puppet-lint
-      puppet-syntax
-      rake
-      rspec-puppet
+    puppetlabs_spec_helper (2.14.1)
+      mocha (~> 1.0)
+      pathspec (~> 0.2.1)
+      puppet-lint (~> 2.0)
+      puppet-syntax (~> 2.0)
+      rspec-puppet (~> 2.0)
     racc (1.4.9)
     rack (1.6.11)
     rainbow (2.1.0)
@@ -138,7 +139,6 @@ DEPENDENCIES
   hiera-eyaml
   json-schema (~> 2.0)
   memory_profiler
-  mocha (~> 0.10.5)
   msgpack
   packaging (~> 0.99)
   pry

data/lib/puppet/application/filebucket.rb

@@ -289,11 +289,15 @@ Copyright (c) 2011 Puppet Inc., LLC Licensed under the Apache 2.0 License
       else
         if Puppet[:server_list] && !Puppet[:server_list].empty?
           server = Puppet[:server_list].first
+          #TRANSLATORS 'server_list' is the name of a setting and should not be translated
+          Puppet.debug _("Selected server from first entry of the `server_list` setting: %{server}:%{port}") % {server: server[0], port: server[1]}
           @client = Puppet::FileBucket::Dipper.new(
             :Server => server[0],
             :Port => server[1]
           )
         else
+          #TRANSLATORS 'server' is the name of a setting and should not be translated
+          Puppet.debug _("Selected server from the `server` setting: %{server}") % {server: Puppet[:server]}
           @client = Puppet::FileBucket::Dipper.new(:Server => Puppet[:server])
         end
       end

data/lib/puppet/configurer.rb

@@ -224,7 +224,8 @@ class Puppet::Configurer
           if server.nil?
             raise Puppet::Error, _("Could not select a functional puppet master from server_list: '%{server_list}'") % { server_list: Puppet[:server_list] }
           else
-            Puppet.debug "Selected master: #{server[0]}:#{server[1]}"
+            #TRANSLATORS 'server_list' is the name of a setting and should not be translated
+            Puppet.debug _("Selected server from the `server_list` setting: %{server}:%{port}") % {server: server[0], port: server[1]}
             report.master_used = "#{server[0]}:#{server[1]}"
           end
           Puppet.override(:server => server[0], :serverport => server[1]) do
@@ -399,12 +400,17 @@ class Puppet::Configurer
               :transaction_uuid => @transaction_uuid,
               :fail_on_404 => false)
           found = true
-        rescue
-          # Nothing to see here
+        rescue  => detail
+          #TRANSLATORS 'server_list' is the name of a setting and should not be translated
+          Puppet.debug _("Unable to connect to server from server_list setting: %{detail}") % {detail: detail}
         end
       end
       found
     end
+    unless selected_server.nil?
+      #TRANSLATORS 'server_list' is the name of a setting and should not be translated
+      Puppet.debug _("Selected functional server from the `server_list` setting: %{server}") % {server: selected_server}
+    end
     { :node => node,
       :server => selected_server }
   end

data/lib/puppet/indirector/request.rb

@@ -196,26 +196,37 @@ class Puppet::Indirector::Request
       end
     end
 
-    # ... Fall back onto the default server.
-     bound_server = Puppet.lookup(:server) do
-      if primary_server = Puppet.settings[:server_list][0]
-        primary_server[0]
-      else
-        Puppet.settings[:server]
+    if default_server
+      self.server = default_server
+    else
+      self.server = Puppet.lookup(:server) do
+        if primary_server = Puppet.settings[:server_list][0]
+          #TRANSLATORS 'server_list' is the name of a setting and should not be translated
+          Puppet.debug _("Selected server from first entry of the `server_list` setting: %{server}") % {server: primary_server[0]}
+          primary_server[0]
+        else
+          #TRANSLATORS 'server' is the name of a setting and should not be translated
+          Puppet.debug _("Selected server from the `server` setting: %{server}") % {server: Puppet.settings[:server]}
+          Puppet.settings[:server]
+        end
       end
     end
 
-    bound_port = Puppet.lookup(:serverport) do
-      if primary_server = Puppet.settings[:server_list][0]
-        primary_server[1]
-      else
-        Puppet.settings[:masterport]
+    if default_port
+      self.port = default_port
+    else
+      self.port = Puppet.lookup(:serverport) do
+        if primary_server = Puppet.settings[:server_list][0]
+          #TRANSLATORS 'server_list' is the name of a setting and should not be translated
+          Puppet.debug _("Selected port from the first entry of the `server_list` setting: %{port}") % {port: primary_server[1]}
+          primary_server[1]
+        else
+          #TRANSLATORS 'masterport' is the name of a setting and should not be translated
+          Puppet.debug _("Selected port from the `masterport` setting: %{port}") % {port: Puppet.settings[:masterport]}
+          Puppet.settings[:masterport]
+        end
       end
     end
-    self.server = default_server || bound_server
-    self.port   = default_port || bound_port
-
-    Puppet.debug "No more servers left, falling back to #{self.server}:#{self.port}" if Puppet.settings[:use_srv_records]
 
     return yield(self)
   end

data/lib/puppet/indirector/rest.rb

@@ -55,15 +55,17 @@ class Puppet::Indirector::REST < Puppet::Indirector::Terminus
   def self.server
     setting = server_setting()
     if setting && setting != :server && Puppet.settings.set_by_config?(setting)
+      Puppet.debug _("Selected server from the %{setting} setting: %{server}") % {setting: setting, server: Puppet.settings[setting]}
       Puppet.settings[setting]
     else
       server = Puppet.lookup(:server) do
         if primary_server = Puppet.settings[:server_list][0]
-          Puppet.debug "Dynamically-bound server lookup failed; using first entry"
+          #TRANSLATORS 'server_list' is the name of a setting and should not be translated
+          Puppet.debug _("Dynamically-bound server lookup failed; using first entry from the `server_list` setting: %{server}") % {server: primary_server[0]}
           primary_server[0]
         else
           setting ||= :server
-          Puppet.debug "Dynamically-bound server lookup failed, falling back to #{setting} setting"
+          Puppet.debug _("Dynamically-bound server lookup failed, falling back to %{setting} setting: %{server}") % {setting: setting, server: Puppet.settings[setting]}
           Puppet.settings[setting]
         end
       end
@@ -80,20 +82,27 @@ class Puppet::Indirector::REST < Puppet::Indirector::Terminus
     setting = port_setting()
     srv_setting = server_setting()
     if (setting && setting != :masterport && Puppet.settings.set_by_config?(setting)) ||
-       (srv_setting && srv_setting != :server && Puppet.settings.set_by_config?(srv_setting))
+        (srv_setting && srv_setting != :server && Puppet.settings.set_by_config?(srv_setting))
+      Puppet.debug _("Selected port from the %{setting} setting: %{port}") % {setting: setting, port: Puppet.settings[setting].to_i}
       Puppet.settings[setting].to_i
     else
       port = Puppet.lookup(:serverport) do
         if primary_server = Puppet.settings[:server_list][0]
-          Puppet.debug "Dynamically-bound port lookup failed; using first entry"
-
           # Port might not be set, so we want to fallback in that
           # case. We know we don't need to use `setting` here, since
           # the default value of every port setting is `masterport`
-          (primary_server[1] || Puppet.settings[:masterport])
+          if primary_server[1]
+            #TRANSLATORS 'server_list' is the name of a setting and should not be translated
+            Puppet.debug _("Dynamically-bound port lookup failed; using first entry from the `server_list` setting: %{port}") % {port: primary_server[1]}
+            primary_server[1]
+          else
+            #TRANSLATORS 'masterport' is the name of a setting and should not be translated
+            Puppet.debug _("Dynamically-bound port lookup failed; falling back to `masterport` setting: %{port}") % {port: Puppet.settings[:masterport]}
+            Puppet.settings[:masterport]
+          end
         else
           setting ||= :masterport
-          Puppet.debug "Dynamically-bound port lookup failed; falling back to #{setting} setting"
+          Puppet.debug _("Dynamically-bound port lookup failed; falling back to %{setting} setting: %{port}") % {setting: setting, port: Puppet.settings[setting]}
           Puppet.settings[setting]
         end
       end

data/lib/puppet/network/http/connection.rb

@@ -131,20 +131,26 @@ module Puppet::Network::HTTP
     # future we may want to refactor these so that they are funneled through
     # that method and do inherit the error handling.
     def request_get(*args, &block)
-      with_connection(@site) do |connection|
-        connection.request_get(*args, &block)
+      with_connection(@site) do |http|
+        resp = http.request_get(*args, &block)
+        Puppet.debug("HTTP GET #{@site}#{args.first.split('?').first} returned #{resp.code} #{resp.message}")
+        resp
       end
     end
 
     def request_head(*args, &block)
-      with_connection(@site) do |connection|
-        connection.request_head(*args, &block)
+      with_connection(@site) do |http|
+        resp = http.request_head(*args, &block)
+        Puppet.debug("HTTP HEAD #{@site}#{args.first.split('?').first} returned #{resp.code} #{resp.message}")
+        resp
       end
     end
 
     def request_post(*args, &block)
-      with_connection(@site) do |connection|
-        connection.request_post(*args, &block)
+      with_connection(@site) do |http|
+        resp = http.request_post(*args, &block)
+        Puppet.debug("HTTP POST #{@site}#{args.first.split('?').first} returned #{resp.code} #{resp.message}")
+        resp
       end
     end
     # end of Net::HTTP#request_* proxies
@@ -299,7 +305,9 @@ module Puppet::Network::HTTP
 
     def execute_request(connection, request)
       start = Time.now
-      connection.request(request)
+      resp = connection.request(request)
+      Puppet.debug("HTTP #{request.method.upcase} #{@site}#{request.path.split('?').first} returned #{resp.code} #{resp.message}")
+      resp
     rescue => exception
       elapsed = (Time.now - start).to_f.round(3)
       uri = [@site.addr, request.path.split('?')[0]].join('/')

data/lib/puppet/transaction/event_manager.rb

@@ -155,11 +155,7 @@ class Puppet::Transaction::EventManager
     return true
   rescue => detail
     resource_error_message = _("Failed to call %{callback}: %{detail}") % { callback: callback, detail: detail }
-    resource.err resource_error_message
-    if not resource.is_a?(Puppet::Type.type(:whit))
-      add_callback_status_event(resource, callback, resource_error_message, "failure")
-    end
-
+    resource.err(resource_error_message)
     transaction.resource_status(resource).failed_to_restart = true
     transaction.resource_status(resource).fail_with_event(resource_error_message)
     resource.log_exception(detail)

data/lib/puppet/type/file/source.rb

@@ -320,7 +320,6 @@ module Puppet
       end
     end
 
-
     def chunk_file_from_source
       get_from_source do |response|
         case response.code

data/lib/puppet/util/http_proxy.rb

@@ -182,6 +182,7 @@ module Puppet::Util::HttpProxy
       end
 
       response = proxy.send(:head, current_uri.path, headers)
+      Puppet.debug("HTTP HEAD request to #{current_uri} returned #{response.code} #{response.message}")
 
       if [301, 302, 307].include?(response.code.to_i)
         # handle the redirection
@@ -195,9 +196,9 @@ module Puppet::Util::HttpProxy
         else
           response = proxy.send(method, current_uri.path, headers)
         end
-      end
 
-      Puppet.debug("HTTP #{method.to_s.upcase} request to #{current_uri} returned #{response.code} #{response.message}")
+        Puppet.debug("HTTP #{method.to_s.upcase} request to #{current_uri} returned #{response.code} #{response.message}")
+      end
 
       return response
     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.5.12'
+  PUPPETVERSION = '5.5.13'
 
   ##
   # version is a public API method intended to always provide a fast and

data/locales/puppet.pot

@@ -6,11 +6,11 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Puppet automation framework 5.5.9-83-g3fc951a\n"
+"Project-Id-Version: Puppet automation framework 5.5.12-15-gc8eb177\n"
 "\n"
 "Report-Msgid-Bugs-To: https://tickets.puppetlabs.com\n"
-"POT-Creation-Date: 2019-03-08 19:30+0000\n"
-"PO-Revision-Date: 2019-03-08 19:30+0000\n"
+"POT-Creation-Date: 2019-04-02 16:46+0000\n"
+"PO-Revision-Date: 2019-04-02 16:46+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
@@ -383,6 +383,17 @@ msgstr ""
 msgid "Cancelling"
 msgstr ""
 
+#. TRANSLATORS 'server_list' is the name of a setting and should not be translated
+#: ../lib/puppet/application/filebucket.rb:293
+msgid "Selected server from first entry of the `server_list` setting: %{server}:%{port}"
+msgstr ""
+
+#. TRANSLATORS 'server' is the name of a setting and should not be translated
+#. TRANSLATORS 'server' is the name of a setting and should not be translated
+#: ../lib/puppet/application/filebucket.rb:300 ../lib/puppet/indirector/request.rb:209
+msgid "Selected server from the `server` setting: %{server}"
+msgstr ""
+
 #: ../lib/puppet/application/lookup.rb:8
 msgid "Run 'puppet lookup --help' for more details"
 msgstr ""
@@ -529,55 +540,70 @@ msgstr ""
 msgid "Could not select a functional puppet master from server_list: '%{server_list}'"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:259
+#. TRANSLATORS 'server_list' is the name of a setting and should not be translated
+#: ../lib/puppet/configurer.rb:228
+msgid "Selected server from the `server_list` setting: %{server}:%{port}"
+msgstr ""
+
+#: ../lib/puppet/configurer.rb:260
 msgid "Local environment: '%{local_env}' doesn't match the environment of the cached catalog '%{catalog_env}', switching agent to '%{catalog_env}'."
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:304
+#: ../lib/puppet/configurer.rb:305
 msgid "Local environment: '%{local_env}' doesn't match server specified node environment '%{node_env}', switching agent to '%{node_env}'."
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:309
+#: ../lib/puppet/configurer.rb:310
 msgid "Using configured environment '%{env}'"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:313
+#: ../lib/puppet/configurer.rb:314
 msgid "Unable to fetch my node definition, but the agent run will continue:"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:337
+#: ../lib/puppet/configurer.rb:338
 msgid "Not using catalog because its environment '%{catalog_env}' does not match agent specified environment '%{local_env}' and strict_environment_mode is set"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:348
+#: ../lib/puppet/configurer.rb:349
 msgid "Catalog environment didn't stabilize after %{tries} fetches, aborting run"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:350
+#: ../lib/puppet/configurer.rb:351
 msgid "Local environment: '%{local_env}' doesn't match server specified environment '%{catalog_env}', restarting agent run with environment '%{catalog_env}'"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:369
+#: ../lib/puppet/configurer.rb:370
 msgid "Failed to apply catalog: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:418 ../lib/puppet/face/report.rb:47
+#. TRANSLATORS 'server_list' is the name of a setting and should not be translated
+#: ../lib/puppet/configurer.rb:405
+msgid "Unable to connect to server from server_list setting: %{detail}"
+msgstr ""
+
+#. TRANSLATORS 'server_list' is the name of a setting and should not be translated
+#: ../lib/puppet/configurer.rb:412
+msgid "Selected functional server from the `server_list` setting: %{server}"
+msgstr ""
+
+#: ../lib/puppet/configurer.rb:424 ../lib/puppet/face/report.rb:47
 msgid "Could not send report: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:427
+#: ../lib/puppet/configurer.rb:433
 msgid "Could not save last run local report: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:439
+#: ../lib/puppet/configurer.rb:445
 msgid "Could not run command from %{setting}: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:457
+#: ../lib/puppet/configurer.rb:463
 msgid "Could not retrieve catalog from cache: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:477
+#: ../lib/puppet/configurer.rb:483
 msgid "Could not retrieve catalog from remote server: %{detail}"
 msgstr ""
 
@@ -2637,7 +2663,7 @@ msgstr ""
 msgid "You cannot save facts to the code store; it is only used for getting facts from a remote device"
 msgstr ""
 
-#: ../lib/puppet/indirector/facts/rest.rb:8 ../lib/puppet/indirector/rest.rb:233
+#: ../lib/puppet/indirector/facts/rest.rb:8 ../lib/puppet/indirector/rest.rb:242
 msgid "PUT does not accept options"
 msgstr ""
 
@@ -2927,7 +2953,22 @@ msgstr ""
 msgid "Error connecting to %{srv_server}:%{srv_port}: %{message}"
 msgstr ""
 
-#: ../lib/puppet/indirector/request.rb:245
+#. TRANSLATORS 'server_list' is the name of a setting and should not be translated
+#: ../lib/puppet/indirector/request.rb:205
+msgid "Selected server from first entry of the `server_list` setting: %{server}"
+msgstr ""
+
+#. TRANSLATORS 'server_list' is the name of a setting and should not be translated
+#: ../lib/puppet/indirector/request.rb:221
+msgid "Selected port from the first entry of the `server_list` setting: %{port}"
+msgstr ""
+
+#. TRANSLATORS 'masterport' is the name of a setting and should not be translated
+#: ../lib/puppet/indirector/request.rb:225
+msgid "Selected port from the `masterport` setting: %{port}"
+msgstr ""
+
+#: ../lib/puppet/indirector/request.rb:256
 msgid "Could not understand URL %{key}: %{detail}"
 msgstr ""
 
@@ -2939,24 +2980,55 @@ msgstr ""
 msgid "Resource instance does not match request key"
 msgstr ""
 
-#: ../lib/puppet/indirector/rest.rb:185
+#: ../lib/puppet/indirector/rest.rb:58
+msgid "Selected server from the %{setting} setting: %{server}"
+msgstr ""
+
+#. TRANSLATORS 'server_list' is the name of a setting and should not be translated
+#: ../lib/puppet/indirector/rest.rb:64
+msgid "Dynamically-bound server lookup failed; using first entry from the `server_list` setting: %{server}"
+msgstr ""
+
+#: ../lib/puppet/indirector/rest.rb:68
+msgid "Dynamically-bound server lookup failed, falling back to %{setting} setting: %{server}"
+msgstr ""
+
+#: ../lib/puppet/indirector/rest.rb:86
+msgid "Selected port from the %{setting} setting: %{port}"
+msgstr ""
+
+#. TRANSLATORS 'server_list' is the name of a setting and should not be translated
+#: ../lib/puppet/indirector/rest.rb:96
+msgid "Dynamically-bound port lookup failed; using first entry from the `server_list` setting: %{port}"
+msgstr ""
+
+#. TRANSLATORS 'masterport' is the name of a setting and should not be translated
+#: ../lib/puppet/indirector/rest.rb:100
+msgid "Dynamically-bound port lookup failed; falling back to `masterport` setting: %{port}"
+msgstr ""
+
+#: ../lib/puppet/indirector/rest.rb:105
+msgid "Dynamically-bound port lookup failed; falling back to %{setting} setting: %{port}"
+msgstr ""
+
+#: ../lib/puppet/indirector/rest.rb:194
 msgid "Find %{uri} resulted in 404 with the message: %{body}"
 msgstr ""
 
-#: ../lib/puppet/indirector/rest.rb:218
+#: ../lib/puppet/indirector/rest.rb:227
 msgid "DELETE does not accept options"
 msgstr ""
 
 #. TRANSLATORS "PSON" should not be translated
-#: ../lib/puppet/indirector/rest.rb:270
+#: ../lib/puppet/indirector/rest.rb:279
 msgid "Downgrading to PSON for future requests"
 msgstr ""
 
-#: ../lib/puppet/indirector/rest.rb:312
+#: ../lib/puppet/indirector/rest.rb:321
 msgid "Error %{code} on SERVER: %{returned_message}"
 msgstr ""
 
-#: ../lib/puppet/indirector/rest.rb:323
+#: ../lib/puppet/indirector/rest.rb:332
 msgid "No content type in http response; cannot parse"
 msgstr ""
 
@@ -4043,45 +4115,45 @@ msgstr ""
 msgid "Unrecognized option(s): %{opts}"
 msgstr ""
 
-#: ../lib/puppet/network/http/connection.rb:204
+#: ../lib/puppet/network/http/connection.rb:210
 msgid "Too many HTTP redirections for %{host}:%{port}"
 msgstr ""
 
 #. TRANSLATORS: Used in the phrase:
 #. "Received a response from the remote server."
-#: ../lib/puppet/network/http/connection.rb:235
+#: ../lib/puppet/network/http/connection.rb:241
 msgid "the remote server"
 msgstr ""
 
-#: ../lib/puppet/network/http/connection.rb:239
+#: ../lib/puppet/network/http/connection.rb:245
 msgid "Received a %{status_code} response from %{server_hostname}, but the Retry-After header value of \"%{retry_after}\" could not be converted to an integer or RFC 2822 date."
 msgstr ""
 
-#: ../lib/puppet/network/http/connection.rb:250
+#: ../lib/puppet/network/http/connection.rb:256
 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:310
+#: ../lib/puppet/network/http/connection.rb:318
 msgid "request %{uri} interrupted after %{elapsed} seconds"
 msgstr ""
 
-#: ../lib/puppet/network/http/connection.rb:312
+#: ../lib/puppet/network/http/connection.rb:320
 msgid "request %{uri} timed out after %{elapsed} seconds"
 msgstr ""
 
-#: ../lib/puppet/network/http/connection.rb:314
+#: ../lib/puppet/network/http/connection.rb:322
 msgid "request %{uri} failed: %{msg}"
 msgstr ""
 
-#: ../lib/puppet/network/http/connection.rb:338
+#: ../lib/puppet/network/http/connection.rb:346
 msgid "expected one of %{certnames}"
 msgstr ""
 
-#: ../lib/puppet/network/http/connection.rb:340
+#: ../lib/puppet/network/http/connection.rb:348
 msgid "expected %{certname}"
 msgstr ""
 
-#: ../lib/puppet/network/http/connection.rb:343
+#: ../lib/puppet/network/http/connection.rb:351
 msgid "Server hostname '%{host}' did not match server certificate; %{expected_certnames}"
 msgstr ""
 
@@ -8378,7 +8450,7 @@ msgstr[1] ""
 msgid "Failed to call %{callback}: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/transaction/event_manager.rb:176
+#: ../lib/puppet/transaction/event_manager.rb:171
 msgid "Would have triggered '%{callback}' from %{count} event"
 msgid_plural "Would have triggered '%{callback}' from %{count} events"
 msgstr[0] ""
@@ -8727,7 +8799,7 @@ msgid "No source for content was stored with the metadata"
 msgstr ""
 
 #. TRANSLATORS "source_permissions" is a parameter name and should not be translated
-#: ../lib/puppet/type/file/source.rb:363
+#: ../lib/puppet/type/file/source.rb:362
 msgid "The `source_permissions` parameter is deprecated. Explicitly set `owner`, `group`, and `mode`."
 msgstr ""
 
@@ -9592,7 +9664,7 @@ msgstr ""
 msgid "Could not write crontab for %{path}: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/util/http_proxy.rb:205
+#: ../lib/puppet/util/http_proxy.rb:206
 msgid "Too many HTTP redirections for %{uri}"
 msgstr ""