puppet 5.5.19-x64-mingw32 → 5.5.20-x64-mingw32

data/lib/puppet/provider/service/systemd.rb

@@ -20,7 +20,7 @@ Puppet::Type.type(:service).provide :systemd, :parent => :base do
   defaultfor :osfamily => :coreos
   defaultfor :operatingsystem => :amazon, :operatingsystemmajrelease => ["2"]
   defaultfor :operatingsystem => :debian, :operatingsystemmajrelease => ["8", "stretch/sid", "9", "buster/sid", "10", "bullseye/sid"]
-  defaultfor :operatingsystem => :ubuntu, :operatingsystemmajrelease => ["15.04","15.10","16.04","16.10","17.04","17.10","18.04"]
+  defaultfor :operatingsystem => :ubuntu, :operatingsystemmajrelease => ["15.04","15.10","16.04","16.10","17.04","17.10","18.04","18.10","19.04","19.10","20.04"]
   defaultfor :operatingsystem => :cumuluslinux, :operatingsystemmajrelease => ["3"]
 
   def self.instances

data/lib/puppet/type/package.rb

@@ -485,6 +485,26 @@ module Puppet
       newvalues(:true, :false)
     end
 
+    newparam(:enable_only, :boolean => false, :parent => Puppet::Parameter::Boolean) do
+      desc <<-EOT
+        Tells `dnf module` to only enable a specific module, instead
+        of installing its default profile.
+
+        Modules with no default profile will be enabled automatically
+        without the use of this parameter.
+
+        Conflicts with the `flavor` property, which selects a profile
+        to install.
+      EOT
+      defaultto false
+
+      validate do |value|
+        if [true, :true, "true"].include?(value) && @resource[:flavor]
+          raise ArgumentError, _('Cannot have both `enable_only => true` and `flavor`')
+        end
+      end
+    end
+
     newparam(:install_only, :boolean => false, :parent => Puppet::Parameter::Boolean, :required_features => :install_only) do
       desc <<-EOT
         It should be set for packages that should only ever be installed,

data/lib/puppet/util/pidlock.rb

@@ -44,7 +44,9 @@ class Puppet::Util::Pidlock
   end
 
   def clear_if_stale
-    return @lockfile.unlock if lock_pid.nil?
+    pid = lock_pid
+    return @lockfile.unlock if pid == nil
+    return if Process.pid == pid
 
     errors = [Errno::ESRCH]
     # Win32::Process now throws SystemCallError. Since this could be
@@ -52,7 +54,7 @@ class Puppet::Util::Pidlock
     errors << SystemCallError if Puppet::Util::Platform.windows?
 
     begin
-      Process.kill(0, lock_pid)
+      Process.kill(0, pid)
     rescue *errors
       return @lockfile.unlock
     end
@@ -61,14 +63,18 @@ class Puppet::Util::Pidlock
     # not, we can unlock the lockfile. For now this is only done on
     # POSIX and Windows platforms (PUP-9247).
     if Puppet.features.posix?
-      procname = Puppet::Util::Execution.execute(["ps", "-p", lock_pid, "-o", "comm="]).strip
-      args     = Puppet::Util::Execution.execute(["ps", "-p", lock_pid, "-o", "args="]).strip
+      procname = Puppet::Util::Execution.execute(["ps", "-p", pid, "-o", "comm="]).strip
+      args     = Puppet::Util::Execution.execute(["ps", "-p", pid, "-o", "args="]).strip
       @lockfile.unlock unless procname =~ /ruby/ && args =~ /puppet/ || procname =~ /puppet(-.*)?$/
     elsif Puppet.features.microsoft_windows?
       # On Windows, we're checking if the filesystem path name of the running
       # process is our vendored ruby:
-      exe_path = Puppet::Util::Windows::Process::get_process_image_name_by_pid(lock_pid)
-      @lockfile.unlock unless exe_path =~ /\\bin\\ruby.exe$/
+      begin
+        exe_path = Puppet::Util::Windows::Process::get_process_image_name_by_pid(pid)
+        @lockfile.unlock unless exe_path =~ /\\bin\\ruby.exe$/
+      rescue Puppet::Util::Windows::Error => e
+        Puppet.debug("Failed to read pidfile #{file_path}: #{e.message}")
+      end
     end
   end
   private :clear_if_stale

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

@@ -180,11 +180,11 @@ module Puppet::Util::Windows::ADSI
         sids
       end
 
-      def name_sid_hash(names)
+      def name_sid_hash(names, allow_unresolved = false)
         return {} if names.nil? || names.empty?
 
         sids = names.map do |name|
-          sid = Puppet::Util::Windows::SID.name_to_principal(name)
+          sid = Puppet::Util::Windows::SID.name_to_principal(name, allow_unresolved)
           raise Puppet::Error.new( _("Could not resolve name: %{name}") % { name: name } ) if !sid
           [sid.sid, sid]
         end

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

@@ -124,26 +124,27 @@ module Puppet::Util::Windows::Process
   def get_process_image_name_by_pid(pid)
     image_name = ""
 
-     open_process(PROCESS_QUERY_INFORMATION, false, pid) do |phandle|
-
-       FFI::MemoryPointer.new(:dword, 1) do |exe_name_length_ptr|
-        # UTF is 2 bytes/char:
-        max_chars = MAX_PATH_LENGTH + 1
-        exe_name_length_ptr.write_dword(max_chars)
-        FFI::MemoryPointer.new(:wchar, max_chars) do |exe_name_ptr|
-          use_win32_path_format = 0
-          result = QueryFullProcessImageNameW(phandle, use_win32_path_format, exe_name_ptr, exe_name_length_ptr)
-          if result == FFI::WIN32_FALSE
-            raise Puppet::Util::Windows::Error.new(
-              "QueryFullProcessImageNameW(phandle, #{use_win32_path_format}, " +
-              "exe_name_ptr, #{max_chars}")
+    Puppet::Util::Windows::Security.with_privilege(Puppet::Util::Windows::Security::SE_DEBUG_NAME) do
+      open_process(PROCESS_QUERY_INFORMATION, false, pid) do |phandle|
+        FFI::MemoryPointer.new(:dword, 1) do |exe_name_length_ptr|
+          # UTF is 2 bytes/char:
+          max_chars = MAX_PATH_LENGTH + 1
+          exe_name_length_ptr.write_dword(max_chars)
+          FFI::MemoryPointer.new(:wchar, max_chars) do |exe_name_ptr|
+            use_win32_path_format = 0
+            result = QueryFullProcessImageNameW(phandle, use_win32_path_format, exe_name_ptr, exe_name_length_ptr)
+            if result == FFI::WIN32_FALSE
+              raise Puppet::Util::Windows::Error.new(
+                      "QueryFullProcessImageNameW(phandle, #{use_win32_path_format}, " +
+                      "exe_name_ptr, #{max_chars}")
+            end
+            image_name = exe_name_ptr.read_wide_string(exe_name_length_ptr.read_dword)
           end
-          image_name = exe_name_ptr.read_wide_string(exe_name_length_ptr.read_dword)
         end
       end
     end
 
-     image_name
+    image_name
   end
   module_function :get_process_image_name_by_pid
 

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

@@ -97,6 +97,7 @@ module Puppet::Util::Windows::Security
   FILE = Puppet::Util::Windows::File
 
   SE_BACKUP_NAME              = 'SeBackupPrivilege'
+  SE_DEBUG_NAME               = 'SeDebugPrivilege'
   SE_RESTORE_NAME             = 'SeRestorePrivilege'
 
   DELETE                      = 0x00010000

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

@@ -64,7 +64,7 @@ module Puppet::Util::Windows
     # 'BUILTIN\Administrators', or 'S-1-5-32-544', and will return the
     # SID object. Returns nil if the account doesn't exist.
     # This method returns a SID::Principal with the account, domain, SID, etc
-    def name_to_principal(name)
+    def name_to_principal(name, allow_unresolved = false)
       # Apparently, we accept a symbol..
       name = name.to_s.strip if name
 
@@ -79,7 +79,7 @@ module Puppet::Util::Windows
 
       raw_sid_bytes ? Principal.lookup_account_sid(raw_sid_bytes) : Principal.lookup_account_name(name)
     rescue
-      nil
+      (allow_unresolved && raw_sid_bytes) ? unresolved_principal(name, raw_sid_bytes) : nil
     end
     module_function :name_to_principal
     class << self; alias name_to_sid_object name_to_principal; end
@@ -236,7 +236,7 @@ module Puppet::Util::Windows
     # @api private
     def self.unresolved_principal(name, sid_bytes)
       Principal.new(
-        name + " (unresolvable)", # account
+        name, # account
         sid_bytes, # sid_bytes
         name, # sid string
         nil, #domain

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.19'
+  PUPPETVERSION = '5.5.20'
 
   ##
   # 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.18-49-g561d1a4850\n"
+"Project-Id-Version: Puppet automation framework 5.5.19-48-g3415147ded\n"
 "\n"
 "Report-Msgid-Bugs-To: https://tickets.puppetlabs.com\n"
-"POT-Creation-Date: 2020-02-05 09:17+0000\n"
-"PO-Revision-Date: 2020-02-05 09:17+0000\n"
+"POT-Creation-Date: 2020-04-24 10:01+0000\n"
+"PO-Revision-Date: 2020-04-24 10:01+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
@@ -48,15 +48,15 @@ msgstr ""
 msgid "Config file %{hiera_config} not found, using Hiera defaults"
 msgstr ""
 
-#: ../lib/puppet.rb:130
+#: ../lib/puppet.rb:133
 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:177
+#: ../lib/puppet.rb:180
 msgid "Creating %{name} via Puppet.newtype is deprecated and will be removed in a future release. Use Puppet::Type.newtype instead."
 msgstr ""
 
-#: ../lib/puppet.rb:196
+#: ../lib/puppet.rb:199
 msgid "The environmentpath setting cannot be empty or nil."
 msgstr ""
 
@@ -86,7 +86,7 @@ msgstr ""
 msgid "puppet agent: applying configuration"
 msgstr ""
 
-#: ../lib/puppet/agent.rb:127
+#: ../lib/puppet/agent.rb:119
 msgid "Could not create instance of %{client_class}: %{detail}"
 msgstr ""
 
@@ -355,38 +355,38 @@ msgstr ""
 msgid "Store and retrieve files in a filebucket"
 msgstr ""
 
-#: ../lib/puppet/application/filebucket.rb:208
+#: ../lib/puppet/application/filebucket.rb:221
 msgid "You must specify a file to back up"
 msgstr ""
 
-#: ../lib/puppet/application/filebucket.rb:212
+#: ../lib/puppet/application/filebucket.rb:225
 msgid "%{file}: no such file"
 msgstr ""
 
-#: ../lib/puppet/application/filebucket.rb:216
+#: ../lib/puppet/application/filebucket.rb:229
 msgid "%{file}: cannot read file"
 msgstr ""
 
-#: ../lib/puppet/application/filebucket.rb:238 ../lib/puppet/application/filebucket.rb:261
+#: ../lib/puppet/application/filebucket.rb:251 ../lib/puppet/application/filebucket.rb:274
 msgid "Need exactly two arguments: filebucket diff <file_a> <file_b>"
 msgstr ""
 
-#: ../lib/puppet/application/filebucket.rb:258
+#: ../lib/puppet/application/filebucket.rb:271
 msgid "Comparing %{checksum_a} %{checksum_b} %{file_a} %{file_b}"
 msgstr ""
 
-#: ../lib/puppet/application/filebucket.rb:272
+#: ../lib/puppet/application/filebucket.rb:285
 msgid "Cancelling"
 msgstr ""
 
 #. TRANSLATORS 'server_list' is the name of a setting and should not be translated
-#: ../lib/puppet/application/filebucket.rb:293
+#: ../lib/puppet/application/filebucket.rb:306
 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
+#: ../lib/puppet/application/filebucket.rb:313 ../lib/puppet/indirector/request.rb:209
 msgid "Selected server from the `server` setting: %{server}"
 msgstr ""
 
@@ -670,55 +670,55 @@ msgstr ""
 msgid "a data type can only have one implementation"
 msgstr ""
 
-#: ../lib/puppet/defaults.rb:126
+#: ../lib/puppet/defaults.rb:130
 msgid "Cannot disable unrecognized warning types %{invalid}."
 msgstr ""
 
-#: ../lib/puppet/defaults.rb:127
+#: ../lib/puppet/defaults.rb:131
 msgid "Valid values are %{values}."
 msgstr ""
 
 #. TRANSLATORS 'data_binding_terminus' is a setting and should not be translated
-#: ../lib/puppet/defaults.rb:480
+#: ../lib/puppet/defaults.rb:484
 msgid "Setting 'data_binding_terminus' is deprecated."
 msgstr ""
 
 #. TRANSLATORS 'hiera' should not be translated
-#: ../lib/puppet/defaults.rb:482
+#: ../lib/puppet/defaults.rb:486
 msgid "Convert custom terminus to hiera 5 API."
 msgstr ""
 
 #. TRANSLATORS 'environment_data_provider' is a setting and should not be translated
-#: ../lib/puppet/defaults.rb:641
+#: ../lib/puppet/defaults.rb:645
 msgid "Setting 'environment_data_provider' is deprecated."
 msgstr ""
 
-#: ../lib/puppet/defaults.rb:743
+#: ../lib/puppet/defaults.rb:747
 msgid "Certificate names must be lower case"
 msgstr ""
 
-#: ../lib/puppet/defaults.rb:988 ../lib/puppet/settings/enum_setting.rb:13 ../lib/puppet/settings/symbolic_enum_setting.rb:14
+#: ../lib/puppet/defaults.rb:992 ../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:1059
+#: ../lib/puppet/defaults.rb:1063
 msgid "The 'caprivatedir' setting is deprecated and will be removed in Puppet 6."
 msgstr ""
 
-#: ../lib/puppet/defaults.rb:1086
+#: ../lib/puppet/defaults.rb:1090
 msgid "The 'capass' setting is deprecated and will be removed in Puppet 6."
 msgstr ""
 
-#: ../lib/puppet/defaults.rb:1326
+#: ../lib/puppet/defaults.rb:1340
 msgid "The 'ca' setting is deprecated and will be removed in Puppet 6."
 msgstr ""
 
-#: ../lib/puppet/defaults.rb:1831 ../lib/puppet/settings.rb:1212
+#: ../lib/puppet/defaults.rb:1854 ../lib/puppet/settings.rb:1212
 msgid "Setting %{name} is deprecated."
 msgstr ""
 
 #. TRANSLATORS 'pluginsync' is a setting and should not be translated
-#: ../lib/puppet/defaults.rb:1882
+#: ../lib/puppet/defaults.rb:1905
 msgid "Setting 'pluginsync' is deprecated."
 msgstr ""
 
@@ -2514,7 +2514,7 @@ msgstr ""
 msgid "Could not find node '%{name}'; cannot compile"
 msgstr ""
 
-#: ../lib/puppet/indirector/catalog/compiler.rb:413
+#: ../lib/puppet/indirector/catalog/compiler.rb:411
 msgid "Could not retrieve fact %{fact}"
 msgstr ""
 
@@ -4114,45 +4114,45 @@ msgstr ""
 msgid "Unrecognized option(s): %{opts}"
 msgstr ""
 
-#: ../lib/puppet/network/http/connection.rb:210
+#: ../lib/puppet/network/http/connection.rb:214
 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:241
+#: ../lib/puppet/network/http/connection.rb:245
 msgid "the remote server"
 msgstr ""
 
-#: ../lib/puppet/network/http/connection.rb:245
+#: ../lib/puppet/network/http/connection.rb:249
 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:256
+#: ../lib/puppet/network/http/connection.rb:260
 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:317
+#: ../lib/puppet/network/http/connection.rb:321
 msgid "request %{uri} interrupted after %{elapsed} seconds"
 msgstr ""
 
-#: ../lib/puppet/network/http/connection.rb:319
+#: ../lib/puppet/network/http/connection.rb:323
 msgid "request %{uri} timed out after %{elapsed} seconds"
 msgstr ""
 
-#: ../lib/puppet/network/http/connection.rb:321
+#: ../lib/puppet/network/http/connection.rb:325
 msgid "request %{uri} failed: %{msg}"
 msgstr ""
 
-#: ../lib/puppet/network/http/connection.rb:346 ../lib/puppet/ssl/validator/default_validator.rb:101
+#: ../lib/puppet/network/http/connection.rb:350 ../lib/puppet/ssl/validator/default_validator.rb:101
 msgid "expected one of %{certnames}"
 msgstr ""
 
-#: ../lib/puppet/network/http/connection.rb:348 ../lib/puppet/ssl/validator/default_validator.rb:103
+#: ../lib/puppet/network/http/connection.rb:352 ../lib/puppet/ssl/validator/default_validator.rb:103
 msgid "expected %{certname}"
 msgstr ""
 
-#: ../lib/puppet/network/http/connection.rb:351 ../lib/puppet/ssl/validator/default_validator.rb:106
+#: ../lib/puppet/network/http/connection.rb:355 ../lib/puppet/ssl/validator/default_validator.rb:106
 msgid "Server hostname '%{host}' did not match server certificate; %{expected_certnames}"
 msgstr ""
 
@@ -4200,7 +4200,7 @@ msgstr ""
 msgid "Could not resolve %{ip}: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/network/http/pool.rb:65
+#: ../lib/puppet/network/http/pool.rb:68
 msgid "Failed to close connection for %{site}: %{detail}"
 msgstr ""
 
@@ -6950,27 +6950,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:85
+#: ../lib/puppet/provider/package/aix.rb:94
 msgid "A directory is required which will be used to find packages"
 msgstr ""
 
-#: ../lib/puppet/provider/package/aix.rb:97
+#: ../lib/puppet/provider/package/aix.rb:106
 msgid "aix package provider is unable to downgrade packages"
 msgstr ""
 
-#: ../lib/puppet/provider/package/aix.rb:116
+#: ../lib/puppet/provider/package/aix.rb:111
+msgid "Package '%{name}' is in a %{status} state and requires manual intervention"
+msgstr ""
+
+#: ../lib/puppet/provider/package/aix.rb:131
 msgid "Could not list installed Packages: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/provider/package/aix.rb:139 ../lib/puppet/provider/package/yum.rb:252
+#: ../lib/puppet/provider/package/aix.rb:154 ../lib/puppet/provider/package/yum.rb:255
 msgid "Tried to get latest on a missing package"
 msgstr ""
 
@@ -7002,7 +7006,7 @@ msgstr ""
 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:93 ../lib/puppet/provider/package/portupgrade.rb:151 ../lib/puppet/provider/package/rug.rb:28 ../lib/puppet/provider/package/up2date.rb:17 ../lib/puppet/provider/package/yum.rb:232 ../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:93 ../lib/puppet/provider/package/portupgrade.rb:151 ../lib/puppet/provider/package/rug.rb:28 ../lib/puppet/provider/package/up2date.rb:17 ../lib/puppet/provider/package/yum.rb:235 ../lib/puppet/provider/package/zypper.rb:109
 msgid "Could not find package %{name}"
 msgstr ""
 
@@ -7321,23 +7325,23 @@ msgstr ""
 msgid "Don't know how to install '%{source}'"
 msgstr ""
 
-#: ../lib/puppet/provider/package/yum.rb:29
+#: ../lib/puppet/provider/package/yum.rb:31
 msgid "The yum provider can only be used as root"
 msgstr ""
 
-#: ../lib/puppet/provider/package/yum.rb:83
+#: ../lib/puppet/provider/package/yum.rb:85
 msgid "Could not check for updates, '%{cmd} check-update' exited with %{status}"
 msgstr ""
 
-#: ../lib/puppet/provider/package/yum.rb:117
+#: ../lib/puppet/provider/package/yum.rb:120
 msgid "Failed to parse package name and architecture from '%{pkgname}'"
 msgstr ""
 
-#: ../lib/puppet/provider/package/yum.rb:226
+#: ../lib/puppet/provider/package/yum.rb:229
 msgid "Could not find package %{wanted}"
 msgstr ""
 
-#: ../lib/puppet/provider/package/yum.rb:237
+#: ../lib/puppet/provider/package/yum.rb:240
 msgid "Failed to update to version %{should}, got version %{version} instead"
 msgstr ""
 
@@ -7373,7 +7377,7 @@ msgstr ""
 msgid "Somehow got told to prefetch with no resource set"
 msgstr ""
 
-#: ../lib/puppet/provider/selmodule/semodule.rb:136
+#: ../lib/puppet/provider/selmodule/semodule.rb:150
 msgid "Could not list policy modules: \"%{selmodule_command}\" failed with \"%{selmod_output}\""
 msgstr ""
 
@@ -8701,82 +8705,82 @@ msgstr ""
 msgid "File paths must be fully qualified, not '%{path}'"
 msgstr ""
 
-#: ../lib/puppet/type/file.rb:124
+#: ../lib/puppet/type/file.rb:137
 msgid "Invalid backup type %{value}"
 msgstr ""
 
-#: ../lib/puppet/type/file.rb:168 ../lib/puppet/type/tidy.rb:48
+#: ../lib/puppet/type/file.rb:181 ../lib/puppet/type/tidy.rb:48
 msgid "Invalid recurse value %{value}"
 msgstr ""
 
-#: ../lib/puppet/type/file.rb:200
+#: ../lib/puppet/type/file.rb:213
 msgid "Invalid recurselimit value %{value}"
 msgstr ""
 
-#: ../lib/puppet/type/file.rb:370
+#: ../lib/puppet/type/file.rb:383
 msgid "You cannot specify more than one of %{creators}"
 msgstr ""
 
-#: ../lib/puppet/type/file.rb:372
+#: ../lib/puppet/type/file.rb:385
 msgid "You cannot specify a remote recursion without a source"
 msgstr ""
 
-#: ../lib/puppet/type/file.rb:374
+#: ../lib/puppet/type/file.rb:387
 msgid "You cannot specify source when using checksum 'none'"
 msgstr ""
 
-#: ../lib/puppet/type/file.rb:377
+#: ../lib/puppet/type/file.rb:390
 msgid "You cannot specify content when using checksum '%{checksum_type}'"
 msgstr ""
 
-#: ../lib/puppet/type/file.rb:380
+#: ../lib/puppet/type/file.rb:393
 msgid "Possible error: recurselimit is set but not recurse, no recursion will happen"
 msgstr ""
 
-#: ../lib/puppet/type/file.rb:388
+#: ../lib/puppet/type/file.rb:401
 msgid "Checksum value '%{value}' is not a valid checksum type %{checksum}"
 msgstr ""
 
-#: ../lib/puppet/type/file.rb:391
+#: ../lib/puppet/type/file.rb:404
 msgid "Checksum value is ignored unless content or source are specified"
 msgstr ""
 
-#: ../lib/puppet/type/file.rb:429
+#: ../lib/puppet/type/file.rb:442
 msgid "Can not find filebucket for backups without a catalog"
 msgstr ""
 
-#: ../lib/puppet/type/file.rb:433
+#: ../lib/puppet/type/file.rb:446
 msgid "Could not find filebucket %{backup} specified in backup"
 msgstr ""
 
-#: ../lib/puppet/type/file.rb:728
+#: ../lib/puppet/type/file.rb:741
 msgid "Could not back up file of type %{current_type}"
 msgstr ""
 
-#: ../lib/puppet/type/file.rb:743
+#: ../lib/puppet/type/file.rb:756
 msgid "Could not remove files of type %{current_type}"
 msgstr ""
 
 #. TRANSLATORS "source_permissions => ignore" should not be translated
-#: ../lib/puppet/type/file.rb:754
+#: ../lib/puppet/type/file.rb:767
 msgid "Copying owner/mode/group from the source file on Windows is not supported; use source_permissions => ignore."
 msgstr ""
 
 #. TRANSLATORS "stat" is a program name and should not be translated
-#: ../lib/puppet/type/file.rb:835 ../lib/puppet/type/k5login.rb:97 ../lib/puppet/type/tidy.rb:345
+#: ../lib/puppet/type/file.rb:848 ../lib/puppet/type/k5login.rb:97 ../lib/puppet/type/tidy.rb:345
 msgid "Could not stat; permission denied"
 msgstr ""
 
-#: ../lib/puppet/type/file.rb:960
+#: ../lib/puppet/type/file.rb:973
 msgid "Not removing directory; use 'force' to override"
 msgstr ""
 
 #. TRANSLATORS refers to a file which could not be backed up
-#: ../lib/puppet/type/file.rb:985
+#: ../lib/puppet/type/file.rb:998
 msgid "Could not back up; will not remove"
 msgstr ""
 
-#: ../lib/puppet/type/file.rb:999
+#: ../lib/puppet/type/file.rb:1012
 msgid "File written to disk did not match checksum; discarding changes (%{content_checksum} vs %{newsum})"
 msgstr ""
 
@@ -8942,11 +8946,15 @@ msgstr ""
 msgid "Name must be a String not %{klass}"
 msgstr ""
 
-#: ../lib/puppet/type/package.rb:635
+#: ../lib/puppet/type/package.rb:503
+msgid "Cannot have both `enable_only => true` and `flavor`"
+msgstr ""
+
+#: ../lib/puppet/type/package.rb:655
 msgid "Invalid hold value %{value}. %{doc}"
 msgstr ""
 
-#: ../lib/puppet/type/package.rb:665
+#: ../lib/puppet/type/package.rb:685
 msgid "You cannot use \"mark\" property while \"ensure\" is one of [\"absent\", \"purged\", \"held\"]"
 msgstr ""
 
@@ -10229,23 +10237,23 @@ msgstr ""
 msgid "Failed to get child process exit code"
 msgstr ""
 
-#: ../lib/puppet/util/windows/process.rb:287
+#: ../lib/puppet/util/windows/process.rb:288
 msgid "GetVersionEx failed"
 msgstr ""
 
-#: ../lib/puppet/util/windows/process.rb:316
+#: ../lib/puppet/util/windows/process.rb:317
 msgid "Discarding environment variable %{string} which contains invalid bytes"
 msgstr ""
 
-#: ../lib/puppet/util/windows/process.rb:332
+#: ../lib/puppet/util/windows/process.rb:333
 msgid "environment variable name must not be nil or empty"
 msgstr ""
 
-#: ../lib/puppet/util/windows/process.rb:337
+#: ../lib/puppet/util/windows/process.rb:338
 msgid "Failed to remove environment variable: %{name}"
 msgstr ""
 
-#: ../lib/puppet/util/windows/process.rb:342
+#: ../lib/puppet/util/windows/process.rb:343
 msgid "Failed to set environment variable: %{name}"
 msgstr ""
 
@@ -10297,77 +10305,77 @@ msgstr ""
 msgid "Failed to import root certificate: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/util/windows/security.rb:173
+#: ../lib/puppet/util/windows/security.rb:174
 msgid "Failed to get volume information"
 msgstr ""
 
 #. TRANSLATORS 'SYSTEM' is a Windows name and should not be translated
-#: ../lib/puppet/util/windows/security.rb:339
+#: ../lib/puppet/util/windows/security.rb:340
 msgid "Setting control rights for %{path} owner SYSTEM to less than Full Control rights. Setting SYSTEM rights to less than Full Control may have unintented consequences for operations on this file"
 msgstr ""
 
 #. TRANSLATORS 'SYSTEM' is a Windows name and should not be translated
-#: ../lib/puppet/util/windows/security.rb:342
+#: ../lib/puppet/util/windows/security.rb:343
 msgid "%{path} owner and group both set to user SYSTEM, but group is not managed directly: SYSTEM user rights will be set to FullControl by group"
 msgstr ""
 
 #. TRANSLATORS 'SYSTEM' is a Windows name and should not be translated
-#: ../lib/puppet/util/windows/security.rb:345
+#: ../lib/puppet/util/windows/security.rb:346
 msgid "An attempt to set mode %{mode} on item %{path} would result in the owner, SYSTEM, to have less than Full Control rights. This attempt has been corrected to Full Control"
 msgstr ""
 
 #. TRANSLATORS 'SYSTEM' is a Windows name and should not be translated
-#: ../lib/puppet/util/windows/security.rb:355
+#: ../lib/puppet/util/windows/security.rb:356
 msgid "Setting control rights for %{path} group SYSTEM to less than Full Control rights. Setting SYSTEM rights to less than Full Control may have unintented consequences for operations on this file"
 msgstr ""
 
 #. TRANSLATORS 'SYSTEM' is a Windows name and should not be translated
-#: ../lib/puppet/util/windows/security.rb:358
+#: ../lib/puppet/util/windows/security.rb:359
 msgid "%{path} owner and group both set to user SYSTEM, but owner is not managed directly: SYSTEM user rights will be set to FullControl by owner"
 msgstr ""
 
 #. TRANSLATORS 'SYSTEM' is a Windows name and should not be translated
-#: ../lib/puppet/util/windows/security.rb:361
+#: ../lib/puppet/util/windows/security.rb:362
 msgid "An attempt to set mode %{mode} on item %{path} would result in the group, SYSTEM, to have less than Full Control rights. This attempt has been corrected to Full Control"
 msgstr ""
 
-#: ../lib/puppet/util/windows/security.rb:432 ../lib/puppet/util/windows/security.rb:449 ../lib/puppet/util/windows/sid.rb:155 ../lib/puppet/util/windows/sid.rb:217 ../lib/puppet/util/windows/user.rb:43
+#: ../lib/puppet/util/windows/security.rb:433 ../lib/puppet/util/windows/security.rb:450 ../lib/puppet/util/windows/sid.rb:155 ../lib/puppet/util/windows/sid.rb:217 ../lib/puppet/util/windows/user.rb:43
 msgid "Invalid SID"
 msgstr ""
 
-#: ../lib/puppet/util/windows/security.rb:436 ../lib/puppet/util/windows/security.rb:453
+#: ../lib/puppet/util/windows/security.rb:437 ../lib/puppet/util/windows/security.rb:454
 msgid "Failed to add access control entry"
 msgstr ""
 
-#: ../lib/puppet/util/windows/security.rb:464 ../lib/puppet/util/windows/security.rb:646
+#: ../lib/puppet/util/windows/security.rb:465 ../lib/puppet/util/windows/security.rb:647
 msgid "Invalid DACL"
 msgstr ""
 
-#: ../lib/puppet/util/windows/security.rb:487
+#: ../lib/puppet/util/windows/security.rb:488
 msgid "Unsupported access control entry type: 0x%{type}"
 msgstr ""
 
-#: ../lib/puppet/util/windows/security.rb:521
+#: ../lib/puppet/util/windows/security.rb:522
 msgid "Failed to open '%{path}'"
 msgstr ""
 
-#: ../lib/puppet/util/windows/security.rb:568
+#: ../lib/puppet/util/windows/security.rb:569
 msgid "Failed to adjust process privileges"
 msgstr ""
 
-#: ../lib/puppet/util/windows/security.rb:598
+#: ../lib/puppet/util/windows/security.rb:599
 msgid "Failed to get security information"
 msgstr ""
 
-#: ../lib/puppet/util/windows/security.rb:609
+#: ../lib/puppet/util/windows/security.rb:610
 msgid "Failed to get security descriptor control"
 msgstr ""
 
-#: ../lib/puppet/util/windows/security.rb:642
+#: ../lib/puppet/util/windows/security.rb:643
 msgid "Failed to initialize ACL"
 msgstr ""
 
-#: ../lib/puppet/util/windows/security.rb:681
+#: ../lib/puppet/util/windows/security.rb:682
 msgid "Failed to set security information"
 msgstr ""