puppet 6.15.0-x64-mingw32 → 6.16.0-x64-mingw32

data/lib/puppet/type/service.rb

@@ -51,7 +51,11 @@ module Puppet
       desc "Whether a service should be enabled to start at boot.
         This property behaves differently depending on the platform;
         wherever possible, it relies on local tools to enable or disable
-        a given service. Default values depend on the platform."
+        a given service. Default values depend on the platform.
+        
+        If you don't specify a value for the `enable` attribute, Puppet leaves
+        that aspect of the service alone and your operating system determines 
+        the behavior."
 
       newvalue(:true, :event => :service_enabled) do
         provider.enable
@@ -80,14 +84,8 @@ module Puppet
         provider.delayed_start
       end
 
-      # This only makes sense on systemd systems. Static services cannot be enabled
-      # or disabled manually.
       def insync?(current)
-        if provider.respond_to?(:cached_enabled?) && provider.cached_enabled? == 'static'
-          Puppet.debug("Unable to enable or disable static service #{@resource[:name]}")
-          return true
-        end
-
+        return provider.enabled_insync?(current) if provider.respond_to?(:enabled_insync?)
         super(current)
       end
 

data/lib/puppet/type/user.rb

@@ -736,17 +736,11 @@ module Puppet
         value = test_sym if [:true, :false].include? test_sym
 
         return [] if value == :false
-        home = resource[:home]
-        if value == :true and not home
-          raise ArgumentError, _("purge_ssh_keys can only be true for users with a defined home directory")
-        end
+        home = resource[:home] || Dir.home(resource[:name])
 
         return [ "#{home}/.ssh/authorized_keys" ] if value == :true
         # value is an array - munge each value
         [ value ].flatten.map do |entry|
-          if entry =~ /^~|^%h/ and not home
-            raise ArgumentError, _("purge_ssh_keys value '%{value}' meta character ~ or %{home_placeholder} only allowed for users with a defined home directory") % { value: value, home_placeholder: '%h' }
-          end
           # make sure frozen value is duplicated by using a gsub, second mutating gsub! is then ok
           entry = entry.gsub(/^~\//, "#{home}/")
           entry.gsub!(/^%h\//, "#{home}/")

data/lib/puppet/util/autoload.rb

@@ -15,6 +15,7 @@ end
 # Autoload paths, either based on names or all at once.
 class Puppet::Util::Autoload
   include Puppet::Concurrent::Synchronized
+  extend Puppet::Concurrent::Synchronized
 
   @loaded = {}
 
@@ -127,19 +128,6 @@ class Puppet::Util::Autoload
       end.directories
     end
 
-    # @api private
-    def vendored_modules
-      dir = Puppet[:vendormoduledir]
-      if dir && File.directory?(dir)
-        Dir.entries(dir)
-          .reject { |f| f =~ /^\./ }
-          .collect { |f| File.join(dir, f, "lib") }
-          .find_all { |d| FileTest.directory?(d) }
-      else
-        []
-      end
-    end
-
     # @api private
     def gem_directories
       gem_source.directories
@@ -167,11 +155,6 @@ class Puppet::Util::Autoload
       # "app_defaults_initialized?" method on the main puppet Settings object.
       # --cprice 2012-03-16
       if Puppet.settings.app_defaults_initialized?
-        unless @initialized
-          $LOAD_PATH.unshift(Puppet[:libdir])
-          $LOAD_PATH.concat(vendored_modules)
-          @initialized = true
-        end
         gem_directories + module_directories(env) + $LOAD_PATH
       else
         gem_directories + $LOAD_PATH

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

@@ -91,18 +91,9 @@ Puppet::Util::Log.newdesttype :file do
       end
     end
 
-    file = File.open(path,  File::WRONLY|File::CREAT|File::APPEND)
+    file = File.open(path, File::WRONLY|File::CREAT|File::APPEND)
     file.puts('[') if need_array_start
 
-    # Give ownership to the user and group puppet will run as
-    if Puppet.features.root? && !Puppet::Util::Platform.windows? && !file_exists
-      begin
-        FileUtils.chown(Puppet[:user], Puppet[:group], path)
-      rescue ArgumentError, Errno::EPERM
-        Puppet.err _("Unable to set ownership to %{user}:%{group} for log file: %{path}") % { user: Puppet[:user], group: Puppet[:group], path: path }
-      end
-    end
-
     @file = file
 
     @autoflush = Puppet[:autoflush]

data/lib/puppet/util/package/version/range.rb

@@ -2,6 +2,7 @@ require 'puppet/util/package/version/range/lt'
 require 'puppet/util/package/version/range/lt_eq'
 require 'puppet/util/package/version/range/gt'
 require 'puppet/util/package/version/range/gt_eq'
+require 'puppet/util/package/version/range/eq'
 require 'puppet/util/package/version/range/min_max'
 
 module Puppet::Util::Package::Version
@@ -20,7 +21,7 @@ module Puppet::Util::Package::Version
     #   * ex. `">1.0.0 <=2.3.0"`
     #
     RANGE_SPLIT = /\s+/
-    FULL_REGEX = /\A((?:[<>=])+)(.+)\Z/
+    FULL_REGEX = /\A((?:[<>=])*)(.+)\Z/
 
     # @param range_string [String] the version range string to parse
     # @param version_class [Version] a version class implementing comparison operators and parse method
@@ -40,6 +41,8 @@ module Puppet::Util::Package::Version
           Lt.new(version_class::parse(version))
         when '<='
           LtEq.new(version_class::parse(version))
+        when ''
+          Eq.new(version_class::parse(version))
         else
           raise ValidationFailure, "Operator '#{operator}' is not implemented"
         end

data/lib/puppet/util/package/version/range/eq.rb

@@ -0,0 +1,14 @@
+require 'puppet/util/package/version/range/simple'
+
+module Puppet::Util::Package::Version
+  class Range
+    class Eq < Simple
+      def to_s
+        "#{@version}"
+      end
+      def include?(version)
+        version == @version
+      end
+    end
+  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 = '6.15.0'
+  PUPPETVERSION = '6.16.0'
 
   ##
   # version is a public API method intended to always provide a fast and

data/locales/puppet.pot

@@ -6,11 +6,11 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Puppet automation framework 6.14.0-210-g48e54bcd2c\n"
+"Project-Id-Version: Puppet automation framework 6.15.0-156-gc38342f706\n"
 "\n"
 "Report-Msgid-Bugs-To: https://tickets.puppetlabs.com\n"
-"POT-Creation-Date: 2020-04-21 01:04+0000\n"
-"PO-Revision-Date: 2020-04-21 01:04+0000\n"
+"POT-Creation-Date: 2020-05-20 22:19+0000\n"
+"PO-Revision-Date: 2020-05-20 22:19+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
@@ -48,21 +48,21 @@ msgstr ""
 msgid "Config file %{hiera_config} not found, using Hiera defaults"
 msgstr ""
 
-#: ../lib/puppet.rb:141
+#: ../lib/puppet.rb:144
 msgid "Support for ruby version %{version} is deprecated and will be removed in a future release. See https://puppet.com/docs/puppet/latest/system_requirements.html for a list of supported ruby versions."
 msgstr ""
 
-#: ../lib/puppet.rb:203
+#: ../lib/puppet.rb:230
 msgid "The environmentpath setting cannot be empty or nil."
 msgstr ""
 
 #. TRANSLATORS: `message` is an already translated string of why SSL failed to initialize
-#: ../lib/puppet.rb:233
+#: ../lib/puppet.rb:257
 msgid "Failed to initialize SSL: %{message}"
 msgstr ""
 
 #. TRANSLATORS: `puppet agent -t` is a command and should not be translated
-#: ../lib/puppet.rb:235
+#: ../lib/puppet.rb:259
 msgid "Run `puppet agent -t`"
 msgstr ""
 
@@ -72,27 +72,39 @@ msgid ""
 "Use 'puppet agent --enable' to re-enable."
 msgstr ""
 
-#: ../lib/puppet/agent.rb:63
+#: ../lib/puppet/agent.rb:67
 msgid "Run of %{client_class} already in progress; skipping  (%{lockfile_path} exists)"
 msgstr ""
 
-#: ../lib/puppet/agent.rb:66
+#: ../lib/puppet/agent.rb:70
+msgid "Exiting now because the maxwaitforlock timeout has been exceeded."
+msgstr ""
+
+#: ../lib/puppet/agent.rb:73
+msgid "Another puppet instance is already running; --waitforlock flag used, waiting for running instance to finish."
+msgstr ""
+
+#: ../lib/puppet/agent.rb:74 ../lib/puppet/ssl/state_machine.rb:279 ../lib/puppet/ssl/state_machine.rb:310
+msgid "Will try again in %{time} seconds."
+msgstr ""
+
+#: ../lib/puppet/agent.rb:79
 msgid "Execution of %{client_class} did not complete within %{runtimeout} seconds and was terminated."
 msgstr ""
 
-#: ../lib/puppet/agent.rb:71
+#: ../lib/puppet/agent.rb:84
 msgid "Could not run %{client_class}: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/agent.rb:78
+#: ../lib/puppet/agent.rb:91
 msgid "Shutdown/restart in progress (%{status}); skipping run"
 msgstr ""
 
-#: ../lib/puppet/agent.rb:96
+#: ../lib/puppet/agent.rb:109
 msgid "puppet agent: applying configuration"
 msgstr ""
 
-#: ../lib/puppet/agent.rb:119
+#: ../lib/puppet/agent.rb:132
 msgid "Could not create instance of %{client_class}: %{detail}"
 msgstr ""
 
@@ -650,20 +662,20 @@ msgstr ""
 msgid "Attempted to pop, but already at root of the context stack."
 msgstr ""
 
-#: ../lib/puppet/context/trusted_information.rb:58
+#: ../lib/puppet/context/trusted_information.rb:53
 msgid "TrustedInformation expected a certificate, but none was given."
 msgstr ""
 
-#: ../lib/puppet/context/trusted_information.rb:98 ../lib/puppet/parser/scope.rb:835
+#: ../lib/puppet/context/trusted_information.rb:104 ../lib/puppet/parser/scope.rb:835
 msgid "Unsupported data type: '%{klass}'"
 msgstr ""
 
-#: ../lib/puppet/daemon.rb:83
-msgid "Cannot reexec unless ARGV arguments are set"
+#: ../lib/puppet/daemon.rb:26
+msgid "Daemons must have an agent"
 msgstr ""
 
-#: ../lib/puppet/daemon.rb:144
-msgid "Daemons must have an agent, server, or both"
+#: ../lib/puppet/daemon.rb:81
+msgid "Cannot reexec unless ARGV arguments are set"
 msgstr ""
 
 #: ../lib/puppet/datatypes.rb:133
@@ -1072,49 +1084,53 @@ msgstr ""
 msgid "The version of the subcommand for which to show help."
 msgstr ""
 
+#: ../lib/puppet/face/help.rb:28
+msgid "Whether to render the help text in ronn format."
+msgstr ""
+
 #. TRANSLATORS 'puppet help' is a command line and should not be translated
-#: ../lib/puppet/face/help.rb:37
+#: ../lib/puppet/face/help.rb:44
 msgid "The 'puppet help' command takes two (optional) arguments: a subcommand and an action"
 msgstr ""
 
 #. TRANSLATORS '--version' is a command line option and should not be translated
-#: ../lib/puppet/face/help.rb:47
+#: ../lib/puppet/face/help.rb:54
 msgid "Supplying a '--version' only makes sense when a Faces subcommand is given"
 msgstr ""
 
-#: ../lib/puppet/face/help.rb:55
+#: ../lib/puppet/face/help.rb:62
 msgid "The legacy subcommand '%{sub_command}' does not support supplying an action"
 msgstr ""
 
-#: ../lib/puppet/face/help.rb:76
+#: ../lib/puppet/face/help.rb:102
 msgid "Could not load help for the application %{application_name}."
 msgstr ""
 
-#: ../lib/puppet/face/help.rb:77 ../lib/puppet/face/help.rb:89
+#: ../lib/puppet/face/help.rb:103 ../lib/puppet/face/help.rb:115
 msgid "Please check the error logs for more information."
 msgstr ""
 
-#: ../lib/puppet/face/help.rb:79 ../lib/puppet/face/help.rb:91
+#: ../lib/puppet/face/help.rb:105 ../lib/puppet/face/help.rb:117
 msgid "Detail: \"%{detail}\""
 msgstr ""
 
-#: ../lib/puppet/face/help.rb:88
+#: ../lib/puppet/face/help.rb:114
 msgid "Could not load help for the face %{face_name}."
 msgstr ""
 
-#: ../lib/puppet/face/help.rb:100
+#: ../lib/puppet/face/help.rb:126
 msgid "Unable to load action %{actionname} from %{face}"
 msgstr ""
 
-#: ../lib/puppet/face/help.rb:144
+#: ../lib/puppet/face/help.rb:170
 msgid "(Deprecated)"
 msgstr ""
 
-#: ../lib/puppet/face/help.rb:147 ../lib/puppet/face/help.rb:159
+#: ../lib/puppet/face/help.rb:173 ../lib/puppet/face/help.rb:185
 msgid "!%{sub_command}! Subcommand unavailable due to error."
 msgstr ""
 
-#: ../lib/puppet/face/help.rb:148 ../lib/puppet/face/help.rb:160
+#: ../lib/puppet/face/help.rb:174 ../lib/puppet/face/help.rb:186
 msgid "Check error logs."
 msgstr ""
 
@@ -1271,15 +1287,19 @@ msgstr ""
 msgid "Search the Puppet Forge for a module."
 msgstr ""
 
-#: ../lib/puppet/face/module/search.rb:12
+#: ../lib/puppet/face/module/search.rb:14
 msgid "Array of module metadata hashes"
 msgstr ""
 
-#: ../lib/puppet/face/module/search.rb:22
+#: ../lib/puppet/face/module/search.rb:24
 msgid "<search_term>"
 msgstr ""
 
-#: ../lib/puppet/face/module/search.rb:34
+#: ../lib/puppet/face/module/search.rb:27
+msgid "This action has been deprecated. Please use the Puppet Forge to search for modules."
+msgstr ""
+
+#: ../lib/puppet/face/module/search.rb:37
 msgid "No results found for '%{term}'."
 msgstr ""
 
@@ -2226,11 +2246,11 @@ msgstr ""
 msgid "Request to %{uri} failed after %{elapsed} seconds: %{message}"
 msgstr ""
 
-#: ../lib/puppet/http/client.rb:310
+#: ../lib/puppet/http/client.rb:321
 msgid "Sleeping for %{interval} seconds before retrying the request"
 msgstr ""
 
-#: ../lib/puppet/http/client.rb:353 ../lib/puppet/indirector/request.rb:142
+#: ../lib/puppet/http/client.rb:364 ../lib/puppet/indirector/request.rb:142
 msgid "HTTP REST queries cannot handle values of type '%{klass}'"
 msgstr ""
 
@@ -2262,12 +2282,12 @@ msgstr ""
 msgid "Ignoring extra header \"%{name}\" as it has no value."
 msgstr ""
 
-#: ../lib/puppet/http/service.rb:145 ../lib/puppet/indirector/rest.rb:282
+#: ../lib/puppet/http/service.rb:145 ../lib/puppet/indirector/rest.rb:288
 msgid "No content type in http response; cannot parse"
 msgstr ""
 
 #. TRANSLATORS "pson", "preferred_serialization_format", and "puppetserver" should not be translated
-#: ../lib/puppet/http/service/report.rb:63
+#: ../lib/puppet/http/service/report.rb:61
 msgid "To submit reports to a server running puppetserver %{server_version}, set preferred_serialization_format to pson"
 msgstr ""
 
@@ -2416,7 +2436,7 @@ msgstr ""
 msgid "Unable to serialize catalog to json, retrying with pson"
 msgstr ""
 
-#: ../lib/puppet/indirector/catalog/rest.rb:34 ../lib/puppet/indirector/facts/rest.rb:22 ../lib/puppet/indirector/file_content/rest.rb:33 ../lib/puppet/indirector/file_metadata/rest.rb:30 ../lib/puppet/indirector/node/rest.rb:25 ../lib/puppet/indirector/rest.rb:144 ../lib/puppet/indirector/status/rest.rb:21
+#: ../lib/puppet/indirector/catalog/rest.rb:34 ../lib/puppet/indirector/facts/rest.rb:22 ../lib/puppet/indirector/file_content/rest.rb:33 ../lib/puppet/indirector/file_metadata/rest.rb:30 ../lib/puppet/indirector/node/rest.rb:25 ../lib/puppet/indirector/rest.rb:146 ../lib/puppet/indirector/status/rest.rb:21
 msgid "Find %{uri} resulted in 404 with the message: %{body}"
 msgstr ""
 
@@ -2520,7 +2540,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:30 ../lib/puppet/indirector/rest.rb:192
+#: ../lib/puppet/indirector/facts/rest.rb:30 ../lib/puppet/indirector/rest.rb:198
 msgid "PUT does not accept options"
 msgstr ""
 
@@ -2571,6 +2591,10 @@ msgstr ""
 msgid "Invalid checksum %{checksum}"
 msgstr ""
 
+#: ../lib/puppet/indirector/file_content/http.rb:14
+msgid "Puppet::Indirector::FileContent::Http is deprecated. Use Puppet::HTTP::Client instead."
+msgstr ""
+
 #: ../lib/puppet/indirector/file_metadata/http.rb:25
 msgid "cannot lookup multiple files"
 msgstr ""
@@ -2799,16 +2823,36 @@ msgstr ""
 msgid "Resource instance does not match request key"
 msgstr ""
 
-#: ../lib/puppet/indirector/rest.rb:177
+#: ../lib/puppet/indirector/rest.rb:115
+msgid "Puppet::Indirector::Rest#find is deprecated. Use Puppet::HTTP::Client instead."
+msgstr ""
+
+#: ../lib/puppet/indirector/rest.rb:154
+msgid "Puppet::Indirector::Rest#head is deprecated. Use Puppet::HTTP::Client instead."
+msgstr ""
+
+#: ../lib/puppet/indirector/rest.rb:167
+msgid "Puppet::Indirector::Rest#search is deprecated. Use Puppet::HTTP::Client instead."
+msgstr ""
+
+#: ../lib/puppet/indirector/rest.rb:181
+msgid "Puppet::Indirector::Rest#destroy is deprecated. Use Puppet::HTTP::Client instead."
+msgstr ""
+
+#: ../lib/puppet/indirector/rest.rb:182
 msgid "DELETE does not accept options"
 msgstr ""
 
+#: ../lib/puppet/indirector/rest.rb:197
+msgid "Puppet::Indirector::Rest#save is deprecated. Use Puppet::HTTP::Client instead."
+msgstr ""
+
 #. TRANSLATORS "PSON" should not be translated
-#: ../lib/puppet/indirector/rest.rb:229
+#: ../lib/puppet/indirector/rest.rb:235
 msgid "Downgrading to PSON for future requests"
 msgstr ""
 
-#: ../lib/puppet/indirector/rest.rb:271 ../lib/puppet/rest/response.rb:31
+#: ../lib/puppet/indirector/rest.rb:277 ../lib/puppet/rest/response.rb:31
 msgid "Error %{code} on SERVER: %{returned_message}"
 msgstr ""
 
@@ -3923,10 +3967,34 @@ msgstr ""
 msgid "Application %{app} assigns multiple nodes to component %{comp}"
 msgstr ""
 
-#: ../lib/puppet/network/http/compression.rb:30 ../lib/puppet/network/http/compression.rb:43
+#: ../lib/puppet/network/http/compression.rb:23 ../lib/puppet/network/http/compression.rb:27
+msgid "Puppet::Network::HTTP::Compression::Active#uncompress_body is deprecated."
+msgstr ""
+
+#: ../lib/puppet/network/http/compression.rb:32 ../lib/puppet/network/http/compression.rb:46
 msgid "Unknown content encoding - %{encoding}"
 msgstr ""
 
+#: ../lib/puppet/network/http/compression.rb:37
+msgid "Puppet::Network::HTTP::Compression::Active#uncompress is deprecated."
+msgstr ""
+
+#: ../lib/puppet/network/http/compression.rb:77
+msgid "Puppet::Network::HTTP::Compression::ZlibAdapter#uncompress is deprecated."
+msgstr ""
+
+#: ../lib/puppet/network/http/compression.rb:104
+msgid "Puppet::Network::HTTP::Compression::None#uncompress_body is deprecated."
+msgstr ""
+
+#: ../lib/puppet/network/http/compression.rb:113
+msgid "Puppet::Network::HTTP::Compression::None#uncompress is deprecated."
+msgstr ""
+
+#: ../lib/puppet/network/http/compression.rb:120
+msgid "Puppet::Network::HTTP::Compression::IdentityAdapter#uncompress is deprecated."
+msgstr ""
+
 #: ../lib/puppet/network/http/connection.rb:56
 msgid "Unrecognized option(s): %{opts}"
 msgstr ""
@@ -3935,7 +4003,7 @@ msgstr ""
 msgid "Expected an instance of Puppet::SSL::Verifier but was passed a %{klass}"
 msgstr ""
 
-#: ../lib/puppet/network/http/connection.rb:229
+#: ../lib/puppet/network/http/connection.rb:229 ../lib/puppet/network/http/connection_adapter.rb:155
 msgid "Too many HTTP redirections for %{host}:%{port}"
 msgstr ""
 
@@ -3965,6 +4033,10 @@ msgstr ""
 msgid "request %{uri} failed: %{msg}"
 msgstr ""
 
+#: ../lib/puppet/network/http/connection.rb:346
+msgid "Puppet::Network::HTTP::Connection is deprecated. Please use Puppet::Network::HTTP::ConnectionAdapter instead."
+msgstr ""
+
 #: ../lib/puppet/network/http/error.rb:23
 msgid "Not Acceptable: %{message}"
 msgstr ""
@@ -4009,7 +4081,11 @@ msgstr ""
 msgid "Could not resolve %{ip}: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/network/http/pool.rb:68
+#: ../lib/puppet/network/http/nocache_pool.rb:6
+msgid "Puppet::Network::HTTP::NoCachePool is deprecated."
+msgstr ""
+
+#: ../lib/puppet/network/http/pool.rb:66
 msgid "Failed to close connection for %{site}: %{detail}"
 msgstr ""
 
@@ -4158,15 +4234,15 @@ msgstr ""
 msgid "Given value for '%{varname}' has illegal type - got: %{type}"
 msgstr ""
 
-#: ../lib/puppet/pal/pal_impl.rb:482
+#: ../lib/puppet/pal/pal_impl.rb:485
 msgid "Puppet Pal: %{what}"
 msgstr ""
 
-#: ../lib/puppet/pal/pal_impl.rb:496
+#: ../lib/puppet/pal/pal_impl.rb:499
 msgid "Cannot use '%{a_term}' and '%{b_term}' at the same time"
 msgstr ""
 
-#: ../lib/puppet/pal/pal_impl.rb:503
+#: ../lib/puppet/pal/pal_impl.rb:506
 msgid "A block must be given"
 msgstr ""
 
@@ -4342,52 +4418,52 @@ msgstr ""
 msgid "Application %{app} maps component %{res} to multiple nodes"
 msgstr ""
 
-#: ../lib/puppet/parser/compiler.rb:357
+#: ../lib/puppet/parser/compiler.rb:367
+msgid "Could not find node statement with name 'default' or '%{names}'"
+msgstr ""
+
+#: ../lib/puppet/parser/compiler.rb:385
 msgid "No source for scope passed to evaluate_classes"
 msgstr ""
 
-#: ../lib/puppet/parser/compiler.rb:373
+#: ../lib/puppet/parser/compiler.rb:401
 msgid "Could not find class %{name} for %{node}"
 msgstr ""
 
-#: ../lib/puppet/parser/compiler.rb:475
+#: ../lib/puppet/parser/compiler.rb:503
 msgid "Capability mapping error: %{kind} clause references nonexistent %{component_type} %{component_name}"
 msgstr ""
 
-#: ../lib/puppet/parser/compiler.rb:502
-msgid "Could not find node statement with name 'default' or '%{names}'"
-msgstr ""
-
-#: ../lib/puppet/parser/compiler.rb:523
+#: ../lib/puppet/parser/compiler.rb:526
 msgid "Evaluated collections"
 msgstr ""
 
-#: ../lib/puppet/parser/compiler.rb:538
+#: ../lib/puppet/parser/compiler.rb:541
 msgid "Evaluated definitions"
 msgstr ""
 
-#: ../lib/puppet/parser/compiler.rb:567
+#: ../lib/puppet/parser/compiler.rb:570
 msgid "Iterated (%{count}) on generators"
 msgstr ""
 
-#: ../lib/puppet/parser/compiler.rb:578
+#: ../lib/puppet/parser/compiler.rb:581
 msgid "Somehow looped more than 1000 times while evaluating host catalog"
 msgstr ""
 
-#: ../lib/puppet/parser/compiler.rb:610
+#: ../lib/puppet/parser/compiler.rb:613
 msgid "Could not find resource(s) %{resources} for overriding"
 msgstr ""
 
-#: ../lib/puppet/parser/compiler.rb:621
+#: ../lib/puppet/parser/compiler.rb:624
 msgid "Failed to realize virtual resources %{resources}"
 msgstr ""
 
 #. TRANSLATORS "main" is a function name and should not be translated
-#: ../lib/puppet/parser/compiler.rb:654
+#: ../lib/puppet/parser/compiler.rb:657
 msgid "Couldn't find main"
 msgstr ""
 
-#: ../lib/puppet/parser/compiler.rb:727
+#: ../lib/puppet/parser/compiler.rb:730
 msgid "For initializing compiler"
 msgstr ""
 
@@ -6674,27 +6750,31 @@ msgstr ""
 msgid "Could not perform network device prefetch: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/provider/package/aix.rb:37
+#: ../lib/puppet/provider/package/aix.rb:46
 msgid "The aix provider can only be used by root"
 msgstr ""
 
-#: ../lib/puppet/provider/package/aix.rb:79 ../lib/puppet/provider/package/nim.rb:53
+#: ../lib/puppet/provider/package/aix.rb:88 ../lib/puppet/provider/package/nim.rb:53
 msgid "Failed to uninstall package '%{name}'"
 msgstr ""
 
-#: ../lib/puppet/provider/package/aix.rb:86
+#: ../lib/puppet/provider/package/aix.rb:95
 msgid "A directory is required which will be used to find packages"
 msgstr ""
 
-#: ../lib/puppet/provider/package/aix.rb:98
+#: ../lib/puppet/provider/package/aix.rb:107
 msgid "aix package provider is unable to downgrade packages"
 msgstr ""
 
-#: ../lib/puppet/provider/package/aix.rb:118
+#: ../lib/puppet/provider/package/aix.rb:112
+msgid "Package '%{name}' is in a %{status} state and requires manual intervention"
+msgstr ""
+
+#: ../lib/puppet/provider/package/aix.rb:133
 msgid "Could not list installed Packages: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/provider/package/aix.rb:141 ../lib/puppet/provider/package/yum.rb:316
+#: ../lib/puppet/provider/package/aix.rb:156 ../lib/puppet/provider/package/yum.rb:332
 msgid "Tried to get latest on a missing package"
 msgstr ""
 
@@ -6714,19 +6794,19 @@ msgstr ""
 msgid "/etc/apt/sources.list contains a cdrom source; not installing.  Use 'allowcdrom' to override this failure."
 msgstr ""
 
-#: ../lib/puppet/provider/package/apt.rb:126 ../lib/puppet/provider/package/fink.rb:55
+#: ../lib/puppet/provider/package/apt.rb:129 ../lib/puppet/provider/package/fink.rb:55
 msgid "Could not find latest version"
 msgstr ""
 
-#: ../lib/puppet/provider/package/apt.rb:137 ../lib/puppet/provider/package/fink.rb:66
+#: ../lib/puppet/provider/package/apt.rb:140 ../lib/puppet/provider/package/fink.rb:66
 msgid "Preseeding %{response} to debconf-set-selections"
 msgstr ""
 
-#: ../lib/puppet/provider/package/apt.rb:141 ../lib/puppet/provider/package/fink.rb:70
+#: ../lib/puppet/provider/package/apt.rb:144 ../lib/puppet/provider/package/fink.rb:70
 msgid "No responsefile specified or non existent, not preseeding anything"
 msgstr ""
 
-#: ../lib/puppet/provider/package/aptitude.rb:21 ../lib/puppet/provider/package/ports.rb:20 ../lib/puppet/provider/package/portupgrade.rb:94 ../lib/puppet/provider/package/portupgrade.rb:152 ../lib/puppet/provider/package/rug.rb:28 ../lib/puppet/provider/package/up2date.rb:17 ../lib/puppet/provider/package/yum.rb:296 ../lib/puppet/provider/package/zypper.rb:109
+#: ../lib/puppet/provider/package/aptitude.rb:21 ../lib/puppet/provider/package/ports.rb:20 ../lib/puppet/provider/package/portupgrade.rb:94 ../lib/puppet/provider/package/portupgrade.rb:152 ../lib/puppet/provider/package/rug.rb:28 ../lib/puppet/provider/package/up2date.rb:17 ../lib/puppet/provider/package/yum.rb:312 ../lib/puppet/provider/package/zypper.rb:146
 msgid "Could not find package %{name}"
 msgstr ""
 
@@ -7049,23 +7129,23 @@ msgstr ""
 msgid "Don't know how to install '%{source}'"
 msgstr ""
 
-#: ../lib/puppet/provider/package/yum.rb:64
+#: ../lib/puppet/provider/package/yum.rb:69
 msgid "The yum provider can only be used as root"
 msgstr ""
 
-#: ../lib/puppet/provider/package/yum.rb:118
+#: ../lib/puppet/provider/package/yum.rb:123
 msgid "Could not check for updates, '%{cmd} check-update' exited with %{status}"
 msgstr ""
 
-#: ../lib/puppet/provider/package/yum.rb:152
+#: ../lib/puppet/provider/package/yum.rb:158
 msgid "Failed to parse package name and architecture from '%{pkgname}'"
 msgstr ""
 
-#: ../lib/puppet/provider/package/yum.rb:290
+#: ../lib/puppet/provider/package/yum.rb:306
 msgid "Could not find package %{wanted}"
 msgstr ""
 
-#: ../lib/puppet/provider/package/yum.rb:301
+#: ../lib/puppet/provider/package/yum.rb:317
 msgid "Failed to update to version %{should}, got version %{version} instead"
 msgstr ""
 
@@ -7252,7 +7332,7 @@ msgstr ""
 msgid "You must pass a callback for non-NONE events"
 msgstr ""
 
-#: ../lib/puppet/reports/http.rb:37
+#: ../lib/puppet/reports/http.rb:38
 msgid "Unable to submit report to %{url} [%{code}] %{message}"
 msgstr ""
 
@@ -8107,20 +8187,24 @@ msgstr ""
 msgid "Couldn't fetch certificate from CA server; you might still need to sign this agent's certificate (%{name}). Exiting now because the maxwaitforcert timeout has been exceeded."
 msgstr ""
 
-#: ../lib/puppet/ssl/state_machine.rb:279
-msgid "Will try again in %{time} seconds."
+#: ../lib/puppet/ssl/state_machine.rb:305
+msgid "Another puppet instance is already running and the waitforlock setting is set to 0; exiting"
 msgstr ""
 
-#: ../lib/puppet/ssl/state_machine.rb:402
-msgid "Verified client certificate '%{subject}' fingerprint %{digest}"
+#: ../lib/puppet/ssl/state_machine.rb:307
+msgid "Another puppet instance is already running and the maxwaitforlock timeout has been exceeded; exiting"
 msgstr ""
 
-#: ../lib/puppet/ssl/state_machine.rb:404
-msgid "Verified CA certificate '%{subject}' fingerprint %{digest}"
+#: ../lib/puppet/ssl/state_machine.rb:309
+msgid "Another puppet instance is already running; waiting for it to finish"
+msgstr ""
+
+#: ../lib/puppet/ssl/state_machine.rb:427
+msgid "Verified client certificate '%{subject}' fingerprint %{digest}"
 msgstr ""
 
-#: ../lib/puppet/ssl/state_machine.rb:430
-msgid "Another puppet instance is already running; exiting"
+#: ../lib/puppet/ssl/state_machine.rb:429
+msgid "Verified CA certificate '%{subject}' fingerprint %{digest}"
 msgstr ""
 
 #. TRANSLATORS: `error` is an untranslated message from openssl describing why a certificate in the server's chain is invalid, and `subject` is the identity/name of the failed certificate
@@ -8662,27 +8746,35 @@ msgstr ""
 msgid "Invalid GID %{gid}"
 msgstr ""
 
-#: ../lib/puppet/type/package.rb:121 ../lib/puppet/type/package.rb:135
+#: ../lib/puppet/type/package.rb:128 ../lib/puppet/type/package.rb:142
 msgid "Could not update: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/type/package.rb:170
+#: ../lib/puppet/type/package.rb:177
 msgid "Could not get latest version: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/type/package.rb:270
+#: ../lib/puppet/type/package.rb:277
 msgid "Name must be a String not %{klass}"
 msgstr ""
 
-#: ../lib/puppet/type/package.rb:510
+#: ../lib/puppet/type/package.rb:423
+msgid "Cannot have both `ensure => disabled` and `flavor`"
+msgstr ""
+
+#: ../lib/puppet/type/package.rb:522
 msgid "Cannot have both `enable_only => true` and `flavor`"
 msgstr ""
 
-#: ../lib/puppet/type/package.rb:672
+#: ../lib/puppet/type/package.rb:525
+msgid "Cannot have both `ensure => disabled` and `enable_only => true`"
+msgstr ""
+
+#: ../lib/puppet/type/package.rb:687
 msgid "Invalid hold value %{value}. %{doc}"
 msgstr ""
 
-#: ../lib/puppet/type/package.rb:702
+#: ../lib/puppet/type/package.rb:717
 msgid "You cannot use \"mark\" property while \"ensure\" is one of [\"absent\", \"purged\", \"held\"]"
 msgstr ""
 
@@ -8738,11 +8830,11 @@ msgstr ""
 msgid "%{value} is not a valid day of the week"
 msgstr ""
 
-#: ../lib/puppet/type/service.rb:96
+#: ../lib/puppet/type/service.rb:90
 msgid "Setting enable to %{value} is only supported on Microsoft Windows."
 msgstr ""
 
-#: ../lib/puppet/type/service.rb:253
+#: ../lib/puppet/type/service.rb:247
 msgid "\"%{value}\" is not a positive integer: the timeout parameter must be specified as a positive integer"
 msgstr ""
 
@@ -8855,15 +8947,7 @@ msgstr ""
 msgid "purge_ssh_keys must be true, false, or an array of file names, not %{value}"
 msgstr ""
 
-#: ../lib/puppet/type/user.rb:741
-msgid "purge_ssh_keys can only be true for users with a defined home directory"
-msgstr ""
-
-#: ../lib/puppet/type/user.rb:748
-msgid "purge_ssh_keys value '%{value}' meta character ~ or %{home_placeholder} only allowed for users with a defined home directory"
-msgstr ""
-
-#: ../lib/puppet/type/user.rb:763
+#: ../lib/puppet/type/user.rb:757
 msgid "Class name must be provided."
 msgstr ""
 
@@ -8962,11 +9046,11 @@ msgstr ""
 msgid "Failed to abandon a child process contract"
 msgstr ""
 
-#: ../lib/puppet/util/autoload.rb:74
+#: ../lib/puppet/util/autoload.rb:75
 msgid "Could not autoload %{name}: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/util/autoload.rb:199
+#: ../lib/puppet/util/autoload.rb:182
 msgid "Autoload paths cannot be fully qualified"
 msgstr ""
 
@@ -9497,10 +9581,6 @@ msgstr ""
 msgid "Creating log directory %{dir}"
 msgstr ""
 
-#: ../lib/puppet/util/log/destinations.rb:102
-msgid "Unable to set ownership to %{user}:%{group} for log file: %{path}"
-msgstr ""
-
 #: ../lib/puppet/util/logging.rb:81 ../lib/puppet/util/logging.rb:105
 msgid "Wrapped exception:"
 msgstr ""
@@ -9538,7 +9618,7 @@ msgstr ""
 msgid "%{value} is an invalid url"
 msgstr ""
 
-#: ../lib/puppet/util/package/version/rpm.rb:47
+#: ../lib/puppet/util/package/version/rpm.rb:40
 msgid "Cannot compare, as %{other} is not a Rpm Version"
 msgstr ""