puppet 6.8.1 → 6.9.0

Sign up to get free protection for your applications and to get access to all the features.

Potentially problematic release.


This version of puppet might be problematic. Click here for more details.

Files changed (93) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile +0 -1
  3. data/Gemfile.lock +10 -11
  4. data/ext/project_data.yaml +1 -0
  5. data/lib/puppet.rb +9 -1
  6. data/lib/puppet/application/agent.rb +12 -0
  7. data/lib/puppet/application_support.rb +1 -1
  8. data/lib/puppet/context.rb +120 -48
  9. data/lib/puppet/face/config.rb +10 -48
  10. data/lib/puppet/face/help.rb +1 -1
  11. data/lib/puppet/face/plugin.rb +9 -2
  12. data/lib/puppet/forge/repository.rb +1 -1
  13. data/lib/puppet/functions/regsubst.rb +58 -37
  14. data/lib/puppet/indirector/catalog/compiler.rb +10 -6
  15. data/lib/puppet/module_tool/applications/uninstaller.rb +2 -3
  16. data/lib/puppet/network/http/connection.rb +1 -1
  17. data/lib/puppet/network/http/factory.rb +1 -1
  18. data/lib/puppet/network/http_pool.rb +1 -0
  19. data/lib/puppet/provider/package/dnf.rb +1 -1
  20. data/lib/puppet/provider/package/rpm.rb +51 -13
  21. data/lib/puppet/provider/package/yum.rb +8 -4
  22. data/lib/puppet/provider/service/systemd.rb +1 -1
  23. data/lib/puppet/settings.rb +40 -0
  24. data/lib/puppet/ssl.rb +1 -1
  25. data/lib/puppet/ssl/base.rb +1 -1
  26. data/lib/puppet/ssl/openssl_loader.rb +28 -0
  27. data/lib/puppet/ssl/validator.rb +1 -1
  28. data/lib/puppet/ssl/validator/default_validator.rb +1 -1
  29. data/lib/puppet/ssl/validator/no_validator.rb +1 -1
  30. data/lib/puppet/thread_local.rb +7 -0
  31. data/lib/puppet/type/exec.rb +14 -6
  32. data/lib/puppet/type/group.rb +4 -2
  33. data/lib/puppet/type/package.rb +10 -0
  34. data/lib/puppet/type/user.rb +4 -2
  35. data/lib/puppet/util/checksums.rb +3 -3
  36. data/lib/puppet/util/http_proxy.rb +8 -6
  37. data/lib/puppet/util/monkey_patches.rb +53 -47
  38. data/lib/puppet/util/platform.rb +16 -0
  39. data/lib/puppet/util/ssl.rb +1 -1
  40. data/lib/puppet/util/windows/root_certs.rb +1 -1
  41. data/lib/puppet/version.rb +1 -1
  42. data/lib/puppet/x509.rb +1 -1
  43. data/locales/puppet.pot +119 -119
  44. data/man/man5/puppet.conf.5 +2 -2
  45. data/man/man8/puppet-agent.8 +1 -1
  46. data/man/man8/puppet-apply.8 +1 -1
  47. data/man/man8/puppet-catalog.8 +1 -1
  48. data/man/man8/puppet-config.8 +1 -1
  49. data/man/man8/puppet-describe.8 +1 -1
  50. data/man/man8/puppet-device.8 +1 -1
  51. data/man/man8/puppet-doc.8 +1 -1
  52. data/man/man8/puppet-epp.8 +1 -1
  53. data/man/man8/puppet-facts.8 +1 -1
  54. data/man/man8/puppet-filebucket.8 +1 -1
  55. data/man/man8/puppet-generate.8 +1 -1
  56. data/man/man8/puppet-help.8 +1 -1
  57. data/man/man8/puppet-key.8 +1 -1
  58. data/man/man8/puppet-lookup.8 +1 -1
  59. data/man/man8/puppet-man.8 +1 -1
  60. data/man/man8/puppet-module.8 +1 -1
  61. data/man/man8/puppet-node.8 +1 -1
  62. data/man/man8/puppet-parser.8 +1 -1
  63. data/man/man8/puppet-plugin.8 +1 -1
  64. data/man/man8/puppet-report.8 +1 -1
  65. data/man/man8/puppet-resource.8 +1 -1
  66. data/man/man8/puppet-script.8 +1 -1
  67. data/man/man8/puppet-ssl.8 +1 -1
  68. data/man/man8/puppet-status.8 +1 -1
  69. data/man/man8/puppet.8 +3 -3
  70. data/spec/integration/provider/service/systemd_spec.rb +7 -6
  71. data/spec/integration/util/execution_spec.rb +1 -1
  72. data/spec/lib/puppet_spec/matchers.rb +0 -13
  73. data/spec/spec_helper.rb +1 -3
  74. data/spec/unit/application/agent_spec.rb +19 -0
  75. data/spec/unit/context_spec.rb +119 -38
  76. data/spec/unit/face/help_spec.rb +1 -1
  77. data/spec/unit/face/plugin_spec.rb +8 -0
  78. data/spec/unit/forge/forge_spec.rb +1 -3
  79. data/spec/unit/forge/repository_spec.rb +1 -3
  80. data/spec/unit/functions/contain_spec.rb +1 -1
  81. data/spec/unit/indirector/catalog/compiler_spec.rb +62 -5
  82. data/spec/unit/module_tool/applications/uninstaller_spec.rb +16 -7
  83. data/spec/unit/node/environment_spec.rb +1 -1
  84. data/spec/unit/provider/package/aptrpm_spec.rb +1 -1
  85. data/spec/unit/provider/package/dnf_spec.rb +7 -0
  86. data/spec/unit/provider/package/pkgin_spec.rb +1 -1
  87. data/spec/unit/provider/package/rpm_spec.rb +150 -16
  88. data/spec/unit/provider/package/yum_spec.rb +7 -0
  89. data/spec/unit/type/exec_spec.rb +9 -0
  90. data/spec/unit/type/schedule_spec.rb +1 -1
  91. data/spec/unit/util/http_proxy_spec.rb +50 -0
  92. data/spec/unit/util/inifile_spec.rb +5 -5
  93. metadata +18 -2
@@ -1,4 +1,4 @@
1
- require 'openssl'
1
+ require 'puppet/ssl/openssl_loader'
2
2
  require 'puppet/ssl'
3
3
  require 'puppet/ssl/digest'
4
4
  require 'puppet/util/ssl'
@@ -0,0 +1,28 @@
1
+ require 'puppet/util/platform'
2
+
3
+ # This file should be required instead of writing `require 'openssl'`
4
+ # or any library that loads openssl like `net/https`. This allows the
5
+ # core Puppet code to load correctly in JRuby environments that do not
6
+ # have a functioning openssl (eg a FIPS enabled one).
7
+
8
+ unless Puppet::Util::Platform.jruby_fips?
9
+ require 'openssl'
10
+ require 'net/https'
11
+ else
12
+ # Even in JRuby we need to define the constants that are wrapped in
13
+ # Indirections: Puppet::SSL::{Key, Certificate, CertificateRequest}
14
+ module OpenSSL
15
+ module PKey
16
+ class RSA; end
17
+ end
18
+
19
+ module X509
20
+ class Request; end
21
+ class Certificate; end
22
+ end
23
+ end
24
+
25
+ Puppet::SSL::Certificate.indirection.terminus = :none
26
+ Puppet::SSL::CertificateRequest.indirection.terminus = :none
27
+ Puppet::SSL::Key.indirection.terminus = :none
28
+ end
@@ -1,4 +1,4 @@
1
- require 'openssl'
1
+ require 'puppet/ssl/openssl_loader'
2
2
 
3
3
  # API for certificate verification
4
4
  #
@@ -1,4 +1,4 @@
1
- require 'openssl'
1
+ require 'puppet/ssl/openssl_loader'
2
2
  require 'puppet/ssl'
3
3
 
4
4
  # Perform peer certificate verification against the known CA.
@@ -1,4 +1,4 @@
1
- require 'openssl'
1
+ require 'puppet/ssl/openssl_loader'
2
2
  require 'puppet/ssl'
3
3
 
4
4
  # Performs no SSL verification
@@ -0,0 +1,7 @@
1
+ require 'concurrent'
2
+
3
+ # We want to use the pure Ruby implementation even on JRuby. If we use the Java
4
+ # implementation of ThreadLocal, we end up leaking references to JRuby instances
5
+ # and preventing them from being garbage collected.
6
+ class Puppet::ThreadLocal < Concurrent::RubyThreadLocalVar
7
+ end
@@ -464,9 +464,13 @@ module Puppet
464
464
  return false
465
465
  end
466
466
 
467
- output.split(/\n/).each { |line|
468
- self.debug(line)
469
- }
467
+ if sensitive
468
+ self.debug("[output redacted]")
469
+ else
470
+ output.split(/\n/).each { |line|
471
+ self.debug(line)
472
+ }
473
+ end
470
474
 
471
475
  status.exitstatus != 0
472
476
  end
@@ -516,9 +520,13 @@ module Puppet
516
520
  return false
517
521
  end
518
522
 
519
- output.split(/\n/).each { |line|
520
- self.debug(line)
521
- }
523
+ if sensitive
524
+ self.debug("[output redacted]")
525
+ else
526
+ output.split(/\n/).each { |line|
527
+ self.debug(line)
528
+ }
529
+ end
522
530
 
523
531
  status.exitstatus == 0
524
532
  end
@@ -24,7 +24,7 @@ module Puppet
24
24
 
25
25
  feature :libuser,
26
26
  "Allows local groups to be managed on systems that also use some other
27
- remote NSS method of managing accounts."
27
+ remote Name Switch Service (NSS) method of managing accounts."
28
28
 
29
29
  ensurable do
30
30
  desc "Create or remove the group."
@@ -216,7 +216,9 @@ module Puppet
216
216
  :required_features => :libuser,
217
217
  :parent => Puppet::Parameter::Boolean) do
218
218
  desc "Forces the management of local accounts when accounts are also
219
- being managed by some other NSS"
219
+ being managed by some other Name Switch Service (NSS).
220
+
221
+ This option relies on your operating system's implementation of `luser*` commands, such as `luseradd` , `lgroupadd`, and `lusermod`. The `forcelocal` option could behave unpredictably in some circumstances. If the tools it depends on are not available, it might have no effect at all."
220
222
  defaultto false
221
223
  end
222
224
 
@@ -1,3 +1,4 @@
1
+ # coding: utf-8
1
2
  # Define the different packaging systems. Each package system is implemented
2
3
  # in a module, which then gets used to individually extend each package object.
3
4
  # This allows packages to exist on the same machine using different packaging
@@ -56,6 +57,7 @@ module Puppet
56
57
  a user or another package. Held is considered a superset of
57
58
  installed.",
58
59
  :methods => [:hold]
60
+ feature :install_only, "The provider accepts options to only install packages never update (kernels, etc.)"
59
61
  feature :install_options, "The provider accepts options to be
60
62
  passed to the installer command."
61
63
  feature :uninstall_options, "The provider accepts options to be
@@ -487,6 +489,14 @@ module Puppet
487
489
  which type of package you want."
488
490
  end
489
491
 
492
+ newparam(:install_only, :boolean => false, :parent => Puppet::Parameter::Boolean, :required_features => :install_only) do
493
+ desc <<-EOT
494
+ It should be set for packages that should only ever be installed,
495
+ never updated. Kernels in particular fall into this category.
496
+ EOT
497
+ defaultto false
498
+ end
499
+
490
500
  newparam(:install_options, :parent => Puppet::Parameter::PackageOptions, :required_features => :install_options) do
491
501
  desc <<-EOT
492
502
  An array of additional options to pass when installing a package. These
@@ -53,7 +53,7 @@ module Puppet
53
53
 
54
54
  feature :libuser,
55
55
  "Allows local users to be managed on systems that also use some other
56
- remote NSS method of managing accounts."
56
+ remote Name Service Switch (NSS) method of managing accounts."
57
57
 
58
58
  feature :manages_shell,
59
59
  "The provider allows for setting shell and validates if possible"
@@ -690,7 +690,9 @@ module Puppet
690
690
  :required_features => :libuser,
691
691
  :parent => Puppet::Parameter::Boolean) do
692
692
  desc "Forces the management of local accounts when accounts are also
693
- being managed by some other NSS"
693
+ being managed by some other Name Service Switch (NSS).
694
+
695
+ This option relies on your operating system's implementation of `luser*` commands, such as `luseradd` , and `lgroupadd`, `lusermod`. The `forcelocal` option could behave unpredictably in some circumstances. If the tools it depends on are not available, it might have no effect at all."
694
696
  defaultto false
695
697
  end
696
698
 
@@ -139,7 +139,7 @@ module Puppet::Util::Checksums
139
139
 
140
140
  # Calculate a checksum using Digest::SHA224.
141
141
  def sha224(content)
142
- require 'openssl'
142
+ require 'puppet/ssl/openssl_loader'
143
143
  OpenSSL::Digest::SHA224.new.hexdigest(content)
144
144
  end
145
145
 
@@ -148,14 +148,14 @@ module Puppet::Util::Checksums
148
148
  end
149
149
 
150
150
  def sha224_file(filename, lite = false)
151
- require 'openssl'
151
+ require 'puppet/ssl/openssl_loader'
152
152
 
153
153
  digest = OpenSSL::Digest::SHA224.new
154
154
  checksum_file(digest, filename, lite)
155
155
  end
156
156
 
157
157
  def sha224_stream(lite = false, &block)
158
- require 'openssl'
158
+ require 'puppet/ssl/openssl_loader'
159
159
  digest = OpenSSL::Digest::SHA224.new
160
160
  checksum_stream(digest, block, lite)
161
161
  end
@@ -1,16 +1,18 @@
1
1
  require 'uri'
2
- require 'openssl'
2
+ require 'puppet/ssl/openssl_loader'
3
3
  require 'puppet/network/http'
4
4
 
5
5
  module Puppet::Util::HttpProxy
6
6
  def self.proxy(uri)
7
- if self.no_proxy?(uri)
8
- proxy_class = Net::HTTP::Proxy(nil)
7
+ if http_proxy_host && !no_proxy?(uri)
8
+ Net::HTTP.new(uri.host, uri.port, self.http_proxy_host, self.http_proxy_port, self.http_proxy_user, self.http_proxy_password)
9
9
  else
10
- proxy_class = Net::HTTP::Proxy(self.http_proxy_host, self.http_proxy_port, self.http_proxy_user, self.http_proxy_password)
10
+ http = Net::HTTP.new(uri.host, uri.port, nil, nil, nil, nil)
11
+ # Net::HTTP defaults the proxy port even though we said not to
12
+ # use one. Set it to nil so caller is not surprised
13
+ http.proxy_port = nil
14
+ http
11
15
  end
12
-
13
- return proxy_class.new(uri.host, uri.port)
14
16
  end
15
17
 
16
18
  def self.http_proxy_env
@@ -1,3 +1,5 @@
1
+ require 'puppet/util/platform'
2
+
1
3
  module Puppet::Util::MonkeyPatches
2
4
  end
3
5
 
@@ -28,34 +30,34 @@ class Object
28
30
  end
29
31
 
30
32
  # (#19151) Reject all SSLv2 ciphers and handshakes
31
- require 'openssl'
32
- class OpenSSL::SSL::SSLContext
33
- if DEFAULT_PARAMS[:options]
34
- DEFAULT_PARAMS[:options] |= OpenSSL::SSL::OP_NO_SSLv2 | OpenSSL::SSL::OP_NO_SSLv3
35
- else
36
- DEFAULT_PARAMS[:options] = OpenSSL::SSL::OP_NO_SSLv2 | OpenSSL::SSL::OP_NO_SSLv3
37
- end
38
- if DEFAULT_PARAMS[:ciphers]
39
- DEFAULT_PARAMS[:ciphers] << ':!SSLv2'
40
- end
33
+ require 'puppet/ssl/openssl_loader'
34
+ unless Puppet::Util::Platform.jruby_fips?
35
+ class OpenSSL::SSL::SSLContext
36
+ if DEFAULT_PARAMS[:options]
37
+ DEFAULT_PARAMS[:options] |= OpenSSL::SSL::OP_NO_SSLv2 | OpenSSL::SSL::OP_NO_SSLv3
38
+ else
39
+ DEFAULT_PARAMS[:options] = OpenSSL::SSL::OP_NO_SSLv2 | OpenSSL::SSL::OP_NO_SSLv3
40
+ end
41
+ if DEFAULT_PARAMS[:ciphers]
42
+ DEFAULT_PARAMS[:ciphers] << ':!SSLv2'
43
+ end
41
44
 
42
- alias __original_initialize initialize
43
- private :__original_initialize
45
+ alias __original_initialize initialize
46
+ private :__original_initialize
44
47
 
45
- def initialize(*args)
46
- __original_initialize(*args)
47
- params = {
48
- :options => DEFAULT_PARAMS[:options],
49
- :ciphers => DEFAULT_PARAMS[:ciphers],
50
- }
51
- set_params(params)
48
+ def initialize(*args)
49
+ __original_initialize(*args)
50
+ params = {
51
+ :options => DEFAULT_PARAMS[:options],
52
+ :ciphers => DEFAULT_PARAMS[:ciphers],
53
+ }
54
+ set_params(params)
55
+ end
52
56
  end
53
57
  end
54
58
 
55
- require 'puppet/util/platform'
56
59
  if Puppet::Util::Platform.windows?
57
60
  require 'puppet/util/windows'
58
- require 'openssl'
59
61
 
60
62
  class OpenSSL::X509::Store
61
63
  @puppet_certs_loaded = false
@@ -80,38 +82,42 @@ if Puppet::Util::Platform.windows?
80
82
  end
81
83
  end
82
84
 
83
- unless OpenSSL::X509::Name.instance_methods.include?(:to_utf8)
84
- class OpenSSL::X509::Name
85
- # https://github.com/openssl/openssl/blob/OpenSSL_1_1_0j/include/openssl/asn1.h#L362
86
- ASN1_STRFLGS_ESC_MSB = 4
87
-
88
- FLAGS = if RUBY_PLATFORM == 'java'
89
- OpenSSL::X509::Name::RFC2253
90
- else
91
- OpenSSL::X509::Name::RFC2253 & ~ASN1_STRFLGS_ESC_MSB
92
- end
93
-
94
- def to_utf8
95
- # https://github.com/ruby/ruby/blob/v2_5_5/ext/openssl/ossl_x509name.c#L317
96
- str = to_s(FLAGS)
97
- str.force_encoding(Encoding::UTF_8)
85
+ unless Puppet::Util::Platform.jruby_fips?
86
+ unless OpenSSL::X509::Name.instance_methods.include?(:to_utf8)
87
+ class OpenSSL::X509::Name
88
+ # https://github.com/openssl/openssl/blob/OpenSSL_1_1_0j/include/openssl/asn1.h#L362
89
+ ASN1_STRFLGS_ESC_MSB = 4
90
+
91
+ FLAGS = if RUBY_PLATFORM == 'java'
92
+ OpenSSL::X509::Name::RFC2253
93
+ else
94
+ OpenSSL::X509::Name::RFC2253 & ~ASN1_STRFLGS_ESC_MSB
95
+ end
96
+
97
+ def to_utf8
98
+ # https://github.com/ruby/ruby/blob/v2_5_5/ext/openssl/ossl_x509name.c#L317
99
+ str = to_s(FLAGS)
100
+ str.force_encoding(Encoding::UTF_8)
101
+ end
98
102
  end
99
103
  end
100
104
  end
101
105
 
102
- unless OpenSSL::PKey::EC.instance_methods.include?(:private?)
103
- class OpenSSL::PKey::EC
104
- # Added in ruby 2.4.0 in https://github.com/ruby/ruby/commit/7c971e61f04
105
- alias :private? :private_key?
106
+ unless Puppet::Util::Platform.jruby_fips?
107
+ unless OpenSSL::PKey::EC.instance_methods.include?(:private?)
108
+ class OpenSSL::PKey::EC
109
+ # Added in ruby 2.4.0 in https://github.com/ruby/ruby/commit/7c971e61f04
110
+ alias :private? :private_key?
111
+ end
106
112
  end
107
- end
108
113
 
109
- unless OpenSSL::PKey::EC.singleton_methods.include?(:generate)
110
- class OpenSSL::PKey::EC
111
- # Added in ruby 2.4.0 in https://github.com/ruby/ruby/commit/85500b66342
112
- def self.generate(string)
113
- ec = OpenSSL::PKey::EC.new(string)
114
- ec.generate_key
114
+ unless OpenSSL::PKey::EC.singleton_methods.include?(:generate)
115
+ class OpenSSL::PKey::EC
116
+ # Added in ruby 2.4.0 in https://github.com/ruby/ruby/commit/85500b66342
117
+ def self.generate(string)
118
+ ec = OpenSSL::PKey::EC.new(string)
119
+ ec.generate_key
120
+ end
115
121
  end
116
122
  end
117
123
  end
@@ -33,6 +33,22 @@ module Puppet
33
33
  def self.jruby?
34
34
  RUBY_PLATFORM == 'java'
35
35
  end
36
+
37
+ def jruby_fips?
38
+ @@jruby_fips ||= if RUBY_PLATFORM == 'java'
39
+ require 'java'
40
+
41
+ begin
42
+ require 'openssl'
43
+ false
44
+ rescue LoadError
45
+ true
46
+ end
47
+ else
48
+ false
49
+ end
50
+ end
51
+ module_function :jruby_fips?
36
52
  end
37
53
  end
38
54
  end
@@ -1,4 +1,4 @@
1
- require 'openssl'
1
+ require 'puppet/ssl/openssl_loader'
2
2
 
3
3
  ##
4
4
  # SSL is a private module with class methods that help work with x.509
@@ -1,5 +1,5 @@
1
1
  require 'puppet/util/windows'
2
- require 'openssl'
2
+ require 'puppet/ssl/openssl_loader'
3
3
  require 'ffi'
4
4
 
5
5
  # Represents a collection of trusted root certificates.
@@ -6,7 +6,7 @@
6
6
  # Raketasks and such to set the version based on the output of `git describe`
7
7
 
8
8
  module Puppet
9
- PUPPETVERSION = '6.8.1'
9
+ PUPPETVERSION = '6.9.0'
10
10
 
11
11
  ##
12
12
  # version is a public API method intended to always provide a fast and
@@ -1,5 +1,5 @@
1
1
  require 'puppet'
2
- require 'openssl'
2
+ require 'puppet/ssl/openssl_loader'
3
3
 
4
4
  module Puppet::X509 # :nodoc:
5
5
  require 'puppet/x509/pem_store'
@@ -6,11 +6,11 @@
6
6
  #, fuzzy
7
7
  msgid ""
8
8
  msgstr ""
9
- "Project-Id-Version: Puppet automation framework 6.7.1-42-gc60d6aa\n"
9
+ "Project-Id-Version: Puppet automation framework 6.8.0-57-g2e8956b\n"
10
10
  "\n"
11
11
  "Report-Msgid-Bugs-To: https://tickets.puppetlabs.com\n"
12
- "POT-Creation-Date: 2019-07-25 21:35+0000\n"
13
- "PO-Revision-Date: 2019-07-25 21:35+0000\n"
12
+ "POT-Creation-Date: 2019-09-04 21:04+0000\n"
13
+ "PO-Revision-Date: 2019-09-04 21:04+0000\n"
14
14
  "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
15
15
  "Language-Team: LANGUAGE <LL@li.org>\n"
16
16
  "Language: \n"
@@ -264,31 +264,31 @@ msgstr ""
264
264
  msgid "%{file} does not exist, cannot apply"
265
265
  msgstr ""
266
266
 
267
- #: ../lib/puppet/application/device.rb:253
267
+ #: ../lib/puppet/application/device.rb:254
268
268
  msgid "Target device / certificate '%{target}' not found in %{config}"
269
269
  msgstr ""
270
270
 
271
- #: ../lib/puppet/application/device.rb:255
271
+ #: ../lib/puppet/application/device.rb:256
272
272
  msgid "No device found in %{config}"
273
273
  msgstr ""
274
274
 
275
- #: ../lib/puppet/application/device.rb:306
275
+ #: ../lib/puppet/application/device.rb:315
276
276
  msgid "retrieving resource: %{resource} from %{target} at %{scheme}%{url_host}%{port}%{url_path}"
277
277
  msgstr ""
278
278
 
279
- #: ../lib/puppet/application/device.rb:321
279
+ #: ../lib/puppet/application/device.rb:330
280
280
  msgid "retrieving facts from %{target} at %{scheme}%{url_host}%{port}%{url_path}"
281
281
  msgstr ""
282
282
 
283
- #: ../lib/puppet/application/device.rb:344
283
+ #: ../lib/puppet/application/device.rb:353
284
284
  msgid "starting applying configuration to %{target} at %{scheme}%{url_host}%{port}%{url_path}"
285
285
  msgstr ""
286
286
 
287
- #: ../lib/puppet/application/device.rb:381 ../lib/puppet/application/resource.rb:196
287
+ #: ../lib/puppet/application/device.rb:391 ../lib/puppet/application/resource.rb:196
288
288
  msgid "You must specify the type to display"
289
289
  msgstr ""
290
290
 
291
- #: ../lib/puppet/application/device.rb:382 ../lib/puppet/application/resource.rb:197
291
+ #: ../lib/puppet/application/device.rb:392 ../lib/puppet/application/resource.rb:197
292
292
  msgid "Could not find type %{type}"
293
293
  msgstr ""
294
294
 
@@ -641,24 +641,20 @@ msgstr ""
641
641
  msgid "Could not retrieve local facts: %{detail}"
642
642
  msgstr ""
643
643
 
644
- #: ../lib/puppet/context.rb:41
645
- msgid "Attempted to pop, but already at root of the context stack."
646
- msgstr ""
647
-
648
- #: ../lib/puppet/context.rb:55
649
- msgid "Unable to lookup '%{name}'"
644
+ #: ../lib/puppet/context.rb:77
645
+ msgid "Mark for '%{name}' already exists"
650
646
  msgstr ""
651
647
 
652
- #: ../lib/puppet/context.rb:80
653
- msgid "no '%{name}' in ignores %{ignores} at top of %{stack}"
648
+ #: ../lib/puppet/context.rb:92
649
+ msgid "Unknown mark '%{name}'"
654
650
  msgstr ""
655
651
 
656
- #: ../lib/puppet/context.rb:93
657
- msgid "Mark for '%{name}' already exists"
652
+ #: ../lib/puppet/context.rb:111 ../lib/puppet/context.rb:169
653
+ msgid "Unable to lookup '%{name}'"
658
654
  msgstr ""
659
655
 
660
- #: ../lib/puppet/context.rb:107
661
- msgid "Unknown mark '%{name}'"
656
+ #: ../lib/puppet/context.rb:120
657
+ msgid "Attempted to pop, but already at root of the context stack."
662
658
  msgstr ""
663
659
 
664
660
  #: ../lib/puppet/context/trusted_information.rb:48
@@ -708,19 +704,19 @@ msgid "Convert custom terminus to hiera 5 API."
708
704
  msgstr ""
709
705
 
710
706
  #. TRANSLATORS 'environment_data_provider' is a setting and should not be translated
711
- #: ../lib/puppet/defaults.rb:672
707
+ #: ../lib/puppet/defaults.rb:676
712
708
  msgid "Setting 'environment_data_provider' is deprecated."
713
709
  msgstr ""
714
710
 
715
- #: ../lib/puppet/defaults.rb:753
711
+ #: ../lib/puppet/defaults.rb:757
716
712
  msgid "Certificate names must be lower case"
717
713
  msgstr ""
718
714
 
719
- #: ../lib/puppet/defaults.rb:934
715
+ #: ../lib/puppet/defaults.rb:938
720
716
  msgid "Setting 'ssl_client_ca_auth' is deprecated."
721
717
  msgstr ""
722
718
 
723
- #: ../lib/puppet/defaults.rb:1013 ../lib/puppet/settings/enum_setting.rb:13 ../lib/puppet/settings/symbolic_enum_setting.rb:14
719
+ #: ../lib/puppet/defaults.rb:1017 ../lib/puppet/settings/enum_setting.rb:13 ../lib/puppet/settings/symbolic_enum_setting.rb:14
724
720
  msgid "Invalid value '%{value}' for parameter %{name}. Allowed values are '%{allowed_values}'"
725
721
  msgstr ""
726
722
 
@@ -1463,11 +1459,11 @@ msgid ""
1463
1459
  " the files downloaded, which will be empty if none were retrieved.\n"
1464
1460
  msgstr ""
1465
1461
 
1466
- #: ../lib/puppet/face/plugin.rb:50
1462
+ #: ../lib/puppet/face/plugin.rb:57
1467
1463
  msgid "No plugins downloaded."
1468
1464
  msgstr ""
1469
1465
 
1470
- #: ../lib/puppet/face/plugin.rb:52
1466
+ #: ../lib/puppet/face/plugin.rb:59
1471
1467
  msgid "Downloaded these plugins: %{plugins}"
1472
1468
  msgstr ""
1473
1469
 
@@ -2346,8 +2342,12 @@ msgstr ""
2346
2342
  msgid "Could not find node '%{name}'; cannot compile"
2347
2343
  msgstr ""
2348
2344
 
2349
- #: ../lib/puppet/indirector/catalog/compiler.rb:410
2350
- msgid "Could not retrieve fact %{fact}"
2345
+ #: ../lib/puppet/indirector/catalog/compiler.rb:416
2346
+ msgid "Could not retrieve fact servername"
2347
+ msgstr ""
2348
+
2349
+ #: ../lib/puppet/indirector/catalog/compiler.rb:425
2350
+ msgid "Could not retrieve either serverip or serverip6 fact"
2351
2351
  msgstr ""
2352
2352
 
2353
2353
  #: ../lib/puppet/indirector/catalog/json.rb:13
@@ -3235,8 +3235,8 @@ msgstr ""
3235
3235
  msgid "Searching %{host} ..."
3236
3236
  msgstr ""
3237
3237
 
3238
- #: ../lib/puppet/module_tool/applications/uninstaller.rb:19
3239
- msgid "Module uninstall is prohibited in FIPS mode."
3238
+ #: ../lib/puppet/module_tool/applications/uninstaller.rb:92
3239
+ msgid "Either the `--ignore_changes` or `--force` argument must be specified to uninstall modules when running in FIPS mode."
3240
3240
  msgstr ""
3241
3241
 
3242
3242
  #: ../lib/puppet/module_tool/applications/unpacker.rb:49
@@ -3955,12 +3955,12 @@ msgid "Missing required Accept header"
3955
3955
  msgstr ""
3956
3956
 
3957
3957
  #. TRANSLATORS 'ssl_context' is an argument and should not be translated
3958
- #: ../lib/puppet/network/http_pool.rb:79
3958
+ #: ../lib/puppet/network/http_pool.rb:80
3959
3959
  msgid "An ssl_context is required when connecting to 'https://%{host}:%{port}'"
3960
3960
  msgstr ""
3961
3961
 
3962
3962
  #. TRANSLATORS 'ssl_context' is an argument and should not be translated
3963
- #: ../lib/puppet/network/http_pool.rb:87
3963
+ #: ../lib/puppet/network/http_pool.rb:88
3964
3964
  msgid "An ssl_context is unnecessary when connecting to 'http://%{host}:%{port}' and will be ignored"
3965
3965
  msgstr ""
3966
3966
 
@@ -5822,64 +5822,64 @@ msgstr ""
5822
5822
  msgid "Recursive lookup detected in [%{name_stack}]"
5823
5823
  msgstr ""
5824
5824
 
5825
- #: ../lib/puppet/pops/lookup/lookup_adapter.rb:101
5825
+ #: ../lib/puppet/pops/lookup/lookup_adapter.rb:108
5826
5826
  msgid "Invalid data type in lookup_options for key '%{key}' could not parse '%{source}', error: '%{msg}"
5827
5827
  msgstr ""
5828
5828
 
5829
5829
  #. TRANSLATORS 'lookup_options', 'convert_to' and args_string variable should not be translated,
5830
- #: ../lib/puppet/pops/lookup/lookup_adapter.rb:109
5830
+ #: ../lib/puppet/pops/lookup/lookup_adapter.rb:116
5831
5831
  msgid "Applying convert_to lookup_option with arguments %{args}"
5832
5832
  msgstr ""
5833
5833
 
5834
- #: ../lib/puppet/pops/lookup/lookup_adapter.rb:112
5834
+ #: ../lib/puppet/pops/lookup/lookup_adapter.rb:119
5835
5835
  msgid "The convert_to lookup_option for key '%{key}' raised error: %{msg}"
5836
5836
  msgstr ""
5837
5837
 
5838
- #: ../lib/puppet/pops/lookup/lookup_adapter.rb:142
5838
+ #: ../lib/puppet/pops/lookup/lookup_adapter.rb:149
5839
5839
  msgid "Lookup of key '%{key}' failed: %{detail}"
5840
5840
  msgstr ""
5841
5841
 
5842
- #: ../lib/puppet/pops/lookup/lookup_adapter.rb:288
5842
+ #: ../lib/puppet/pops/lookup/lookup_adapter.rb:295
5843
5843
  msgid "value of %{opts} must be a hash"
5844
5844
  msgstr ""
5845
5845
 
5846
- #: ../lib/puppet/pops/lookup/lookup_adapter.rb:295
5846
+ #: ../lib/puppet/pops/lookup/lookup_adapter.rb:302
5847
5847
  msgid "all %{opts} patterns must match a key starting with module name '%{module_name}'"
5848
5848
  msgstr ""
5849
5849
 
5850
- #: ../lib/puppet/pops/lookup/lookup_adapter.rb:299
5850
+ #: ../lib/puppet/pops/lookup/lookup_adapter.rb:306
5851
5851
  msgid "all %{opts} keys must start with module name '%{module_name}'"
5852
5852
  msgstr ""
5853
5853
 
5854
- #: ../lib/puppet/pops/lookup/lookup_adapter.rb:424
5854
+ #: ../lib/puppet/pops/lookup/lookup_adapter.rb:431
5855
5855
  msgid "Defining \"data_provider\": \"%{name}\" in metadata.json is deprecated. It is ignored since a '%{config}' with version >= 5 is present"
5856
5856
  msgstr ""
5857
5857
 
5858
- #: ../lib/puppet/pops/lookup/lookup_adapter.rb:434
5858
+ #: ../lib/puppet/pops/lookup/lookup_adapter.rb:441
5859
5859
  msgid "Defining \"data_provider\": \"%{name}\" in metadata.json is deprecated."
5860
5860
  msgstr ""
5861
5861
 
5862
- #: ../lib/puppet/pops/lookup/lookup_adapter.rb:435 ../lib/puppet/pops/lookup/lookup_adapter.rb:489
5862
+ #: ../lib/puppet/pops/lookup/lookup_adapter.rb:442 ../lib/puppet/pops/lookup/lookup_adapter.rb:496
5863
5863
  msgid "A '%{hiera_config}' file should be used instead"
5864
5864
  msgstr ""
5865
5865
 
5866
- #: ../lib/puppet/pops/lookup/lookup_adapter.rb:449
5866
+ #: ../lib/puppet/pops/lookup/lookup_adapter.rb:456
5867
5867
  msgid "Environment '%{env}', cannot find module_data_provider '%{provider}'"
5868
5868
  msgstr ""
5869
5869
 
5870
- #: ../lib/puppet/pops/lookup/lookup_adapter.rb:473
5870
+ #: ../lib/puppet/pops/lookup/lookup_adapter.rb:480
5871
5871
  msgid "Defining environment_data_provider='%{provider_name}' in environment.conf is deprecated"
5872
5872
  msgstr ""
5873
5873
 
5874
- #: ../lib/puppet/pops/lookup/lookup_adapter.rb:477
5874
+ #: ../lib/puppet/pops/lookup/lookup_adapter.rb:484
5875
5875
  msgid "The environment_data_provider='%{provider_name}' setting is ignored since '%{config_path}' version >= 5"
5876
5876
  msgstr ""
5877
5877
 
5878
- #: ../lib/puppet/pops/lookup/lookup_adapter.rb:488
5878
+ #: ../lib/puppet/pops/lookup/lookup_adapter.rb:495
5879
5879
  msgid "Defining environment_data_provider='%{provider_name}' in environment.conf is deprecated."
5880
5880
  msgstr ""
5881
5881
 
5882
- #: ../lib/puppet/pops/lookup/lookup_adapter.rb:504
5882
+ #: ../lib/puppet/pops/lookup/lookup_adapter.rb:511
5883
5883
  msgid "Environment '%{env}', cannot find environment_data_provider '%{provider}'"
5884
5884
  msgstr ""
5885
5885
 
@@ -6439,11 +6439,11 @@ msgstr ""
6439
6439
  msgid "aix.object_info(): Could not find %{resource}[%{name}]"
6440
6440
  msgstr ""
6441
6441
 
6442
- #: ../lib/puppet/provider/aix_object.rb:469 ../lib/puppet/provider/nameservice.rb:181 ../lib/puppet/provider/nameservice/directoryservice.rb:425
6442
+ #: ../lib/puppet/provider/aix_object.rb:469 ../lib/puppet/provider/nameservice.rb:182 ../lib/puppet/provider/nameservice/directoryservice.rb:425
6443
6443
  msgid "Could not create %{resource} %{name}: %{detail}"
6444
6444
  msgstr ""
6445
6445
 
6446
- #: ../lib/puppet/provider/aix_object.rb:481 ../lib/puppet/provider/nameservice.rb:195
6446
+ #: ../lib/puppet/provider/aix_object.rb:481 ../lib/puppet/provider/nameservice.rb:196
6447
6447
  msgid "Could not delete %{resource} %{name}: %{detail}"
6448
6448
  msgstr ""
6449
6449
 
@@ -6479,23 +6479,23 @@ msgstr ""
6479
6479
  msgid "'%{exe}' is not executable"
6480
6480
  msgstr ""
6481
6481
 
6482
- #: ../lib/puppet/provider/file/posix.rb:67
6482
+ #: ../lib/puppet/provider/file/posix.rb:72
6483
6483
  msgid "Apparently using negative UID (%{currentvalue}) on a platform that does not consistently handle them"
6484
6484
  msgstr ""
6485
6485
 
6486
- #: ../lib/puppet/provider/file/posix.rb:85 ../lib/puppet/provider/file/windows.rb:46
6486
+ #: ../lib/puppet/provider/file/posix.rb:90 ../lib/puppet/provider/file/windows.rb:46
6487
6487
  msgid "Failed to set owner to '%{should}': %{detail}"
6488
6488
  msgstr ""
6489
6489
 
6490
- #: ../lib/puppet/provider/file/posix.rb:99
6490
+ #: ../lib/puppet/provider/file/posix.rb:104
6491
6491
  msgid "Apparently using negative GID (%{currentvalue}) on a platform that does not consistently handle them"
6492
6492
  msgstr ""
6493
6493
 
6494
- #: ../lib/puppet/provider/file/posix.rb:117 ../lib/puppet/provider/file/windows.rb:59
6494
+ #: ../lib/puppet/provider/file/posix.rb:122 ../lib/puppet/provider/file/windows.rb:59
6495
6495
  msgid "Failed to set group to '%{should}': %{detail}"
6496
6496
  msgstr ""
6497
6497
 
6498
- #: ../lib/puppet/provider/file/posix.rb:134 ../lib/puppet/provider/file/windows.rb:78
6498
+ #: ../lib/puppet/provider/file/posix.rb:139 ../lib/puppet/provider/file/windows.rb:78
6499
6499
  msgid "failed to set mode %{mode} on %{path}: %{message}"
6500
6500
  msgstr ""
6501
6501
 
@@ -6549,15 +6549,15 @@ msgstr ""
6549
6549
  msgid "already exists"
6550
6550
  msgstr ""
6551
6551
 
6552
- #: ../lib/puppet/provider/nameservice.rb:187
6552
+ #: ../lib/puppet/provider/nameservice.rb:188
6553
6553
  msgid "already absent"
6554
6554
  msgstr ""
6555
6555
 
6556
- #: ../lib/puppet/provider/nameservice.rb:281
6556
+ #: ../lib/puppet/provider/nameservice.rb:282
6557
6557
  msgid "Nameservice command must be an array"
6558
6558
  msgstr ""
6559
6559
 
6560
- #: ../lib/puppet/provider/nameservice.rb:285 ../lib/puppet/provider/nameservice/directoryservice.rb:340 ../lib/puppet/provider/nameservice/directoryservice.rb:369
6560
+ #: ../lib/puppet/provider/nameservice.rb:287 ../lib/puppet/provider/nameservice/directoryservice.rb:340 ../lib/puppet/provider/nameservice/directoryservice.rb:369
6561
6561
  msgid "Could not set %{param} on %{resource}[%{name}]: %{detail}"
6562
6562
  msgstr ""
6563
6563
 
@@ -6619,7 +6619,7 @@ msgstr ""
6619
6619
  msgid "Could not list installed Packages: %{detail}"
6620
6620
  msgstr ""
6621
6621
 
6622
- #: ../lib/puppet/provider/package/aix.rb:141 ../lib/puppet/provider/package/yum.rb:248
6622
+ #: ../lib/puppet/provider/package/aix.rb:141 ../lib/puppet/provider/package/yum.rb:252
6623
6623
  msgid "Tried to get latest on a missing package"
6624
6624
  msgstr ""
6625
6625
 
@@ -6651,7 +6651,7 @@ msgstr ""
6651
6651
  msgid "No responsefile specified or non existent, not preseeding anything"
6652
6652
  msgstr ""
6653
6653
 
6654
- #: ../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:229 ../lib/puppet/provider/package/zypper.rb:109
6654
+ #: ../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:232 ../lib/puppet/provider/package/zypper.rb:109
6655
6655
  msgid "Could not find package %{name}"
6656
6656
  msgstr ""
6657
6657
 
@@ -6913,11 +6913,11 @@ msgstr ""
6913
6913
  msgid "portversion.latest() - fatal error with portversion: %{output}"
6914
6914
  msgstr ""
6915
6915
 
6916
- #: ../lib/puppet/provider/package/rpm.rb:90
6916
+ #: ../lib/puppet/provider/package/rpm.rb:89
6917
6917
  msgid "Failed to list packages"
6918
6918
  msgstr ""
6919
6919
 
6920
- #: ../lib/puppet/provider/package/rpm.rb:131 ../lib/puppet/provider/package/rpm.rb:144
6920
+ #: ../lib/puppet/provider/package/rpm.rb:128 ../lib/puppet/provider/package/rpm.rb:141
6921
6921
  msgid "RPMs must specify a package source"
6922
6922
  msgstr ""
6923
6923
 
@@ -6974,11 +6974,11 @@ msgstr ""
6974
6974
  msgid "Failed to parse package name and architecture from '%{pkgname}'"
6975
6975
  msgstr ""
6976
6976
 
6977
- #: ../lib/puppet/provider/package/yum.rb:223
6977
+ #: ../lib/puppet/provider/package/yum.rb:226
6978
6978
  msgid "Could not find package %{wanted}"
6979
6979
  msgstr ""
6980
6980
 
6981
- #: ../lib/puppet/provider/package/yum.rb:234
6981
+ #: ../lib/puppet/provider/package/yum.rb:237
6982
6982
  msgid "Failed to update to version %{should}, got version %{version} instead"
6983
6983
  msgstr ""
6984
6984
 
@@ -7644,7 +7644,7 @@ msgstr ""
7644
7644
  msgid "%{name} has not declared what class it wraps"
7645
7645
  msgstr ""
7646
7646
 
7647
- #: ../lib/puppet/ssl/base.rb:32 ../lib/puppet/x509/cert_provider.rb:340
7647
+ #: ../lib/puppet/ssl/base.rb:32 ../lib/puppet/x509/cert_provider.rb:338
7648
7648
  msgid "Certname %{name} must not contain unprintable or non-ASCII characters"
7649
7649
  msgstr ""
7650
7650
 
@@ -8317,19 +8317,19 @@ msgstr ""
8317
8317
  msgid "You cannot add relationships without a catalog"
8318
8318
  msgstr ""
8319
8319
 
8320
- #: ../lib/puppet/type.rb:2482
8320
+ #: ../lib/puppet/type.rb:2481
8321
8321
  msgid "Unable to mark '%{name}' as sensitive: %{name} is a parameter and not a property, and cannot be automatically redacted."
8322
8322
  msgstr ""
8323
8323
 
8324
- #: ../lib/puppet/type.rb:2485
8324
+ #: ../lib/puppet/type.rb:2484
8325
8325
  msgid "Unable to mark '%{name}' as sensitive: the property itself was not assigned a value."
8326
8326
  msgstr ""
8327
8327
 
8328
- #: ../lib/puppet/type.rb:2487
8328
+ #: ../lib/puppet/type.rb:2486
8329
8329
  msgid "Unable to mark '%{name}' as sensitive: the property itself is not defined on %{type}."
8330
8330
  msgstr ""
8331
8331
 
8332
- #: ../lib/puppet/type.rb:2545
8332
+ #: ../lib/puppet/type.rb:2544
8333
8333
  msgid "Could not set %{attribute} on %{class_name}: %{detail}"
8334
8334
  msgstr ""
8335
8335
 
@@ -8555,15 +8555,15 @@ msgstr ""
8555
8555
  msgid "Invalid GID %{gid}"
8556
8556
  msgstr ""
8557
8557
 
8558
- #: ../lib/puppet/type/package.rb:116 ../lib/puppet/type/package.rb:130
8558
+ #: ../lib/puppet/type/package.rb:118 ../lib/puppet/type/package.rb:132
8559
8559
  msgid "Could not update: %{detail}"
8560
8560
  msgstr ""
8561
8561
 
8562
- #: ../lib/puppet/type/package.rb:165
8562
+ #: ../lib/puppet/type/package.rb:167
8563
8563
  msgid "Could not get latest version: %{detail}"
8564
8564
  msgstr ""
8565
8565
 
8566
- #: ../lib/puppet/type/package.rb:265
8566
+ #: ../lib/puppet/type/package.rb:267
8567
8567
  msgid "Name must be a String not %{klass}"
8568
8568
  msgstr ""
8569
8569
 
@@ -8720,31 +8720,31 @@ msgstr ""
8720
8720
  msgid "Profile names must be provided as an array, not a comma-separated list"
8721
8721
  msgstr ""
8722
8722
 
8723
- #: ../lib/puppet/type/user.rb:700
8723
+ #: ../lib/puppet/type/user.rb:702
8724
8724
  msgid "Ssh_authorized_key type is not available. Cannot purge SSH keys."
8725
8725
  msgstr ""
8726
8726
 
8727
- #: ../lib/puppet/type/user.rb:738
8727
+ #: ../lib/puppet/type/user.rb:740
8728
8728
  msgid "Each entry for purge_ssh_keys must be a string, not a %{klass}"
8729
8729
  msgstr ""
8730
8730
 
8731
- #: ../lib/puppet/type/user.rb:741
8731
+ #: ../lib/puppet/type/user.rb:743
8732
8732
  msgid "Paths to keyfiles must be absolute, not %{entry}"
8733
8733
  msgstr ""
8734
8734
 
8735
- #: ../lib/puppet/type/user.rb:745
8735
+ #: ../lib/puppet/type/user.rb:747
8736
8736
  msgid "purge_ssh_keys must be true, false, or an array of file names, not %{value}"
8737
8737
  msgstr ""
8738
8738
 
8739
- #: ../lib/puppet/type/user.rb:757
8739
+ #: ../lib/puppet/type/user.rb:759
8740
8740
  msgid "purge_ssh_keys can only be true for users with a defined home directory"
8741
8741
  msgstr ""
8742
8742
 
8743
- #: ../lib/puppet/type/user.rb:764
8743
+ #: ../lib/puppet/type/user.rb:766
8744
8744
  msgid "purge_ssh_keys value '%{value}' meta character ~ or %{home_placeholder} only allowed for users with a defined home directory"
8745
8745
  msgstr ""
8746
8746
 
8747
- #: ../lib/puppet/type/user.rb:779
8747
+ #: ../lib/puppet/type/user.rb:781
8748
8748
  msgid "Class name must be provided."
8749
8749
  msgstr ""
8750
8750
 
@@ -9123,23 +9123,23 @@ msgstr ""
9123
9123
  msgid "%{klass} failed with error %{error_type}: %{detail}"
9124
9124
  msgstr ""
9125
9125
 
9126
- #: ../lib/puppet/util/execution.rb:195
9126
+ #: ../lib/puppet/util/execution.rb:196
9127
9127
  msgid "Working directory %{cwd} does not exist!"
9128
9128
  msgstr ""
9129
9129
 
9130
- #: ../lib/puppet/util/execution.rb:287
9130
+ #: ../lib/puppet/util/execution.rb:288
9131
9131
  msgid "Could not get output"
9132
9132
  msgstr ""
9133
9133
 
9134
- #: ../lib/puppet/util/execution.rb:296
9134
+ #: ../lib/puppet/util/execution.rb:297
9135
9135
  msgid "Execution of '%{str}' returned %{exit_status}: %{output}"
9136
9136
  msgstr ""
9137
9137
 
9138
- #: ../lib/puppet/util/execution.rb:373
9138
+ #: ../lib/puppet/util/execution.rb:374
9139
9139
  msgid "Could not execute posix command: %{detail}"
9140
9140
  msgstr ""
9141
9141
 
9142
- #: ../lib/puppet/util/execution.rb:421
9142
+ #: ../lib/puppet/util/execution.rb:422
9143
9143
  msgid "Waiting for output; will sleep %{time_to_sleep} seconds"
9144
9144
  msgstr ""
9145
9145
 
@@ -9251,7 +9251,7 @@ msgstr ""
9251
9251
  msgid "Could not write crontab for %{path}: %{detail}"
9252
9252
  msgstr ""
9253
9253
 
9254
- #: ../lib/puppet/util/http_proxy.rb:207
9254
+ #: ../lib/puppet/util/http_proxy.rb:221
9255
9255
  msgid "Too many HTTP redirections for %{uri}"
9256
9256
  msgstr ""
9257
9257
 
@@ -9503,31 +9503,31 @@ msgstr ""
9503
9503
  msgid "Caught exception %{klass}:%{error} retrying"
9504
9504
  msgstr ""
9505
9505
 
9506
- #: ../lib/puppet/util/selinux.rb:67
9506
+ #: ../lib/puppet/util/selinux.rb:71
9507
9507
  msgid "Invalid context to parse: %{context}"
9508
9508
  msgstr ""
9509
9509
 
9510
- #: ../lib/puppet/util/selinux.rb:79
9510
+ #: ../lib/puppet/util/selinux.rb:83
9511
9511
  msgid "Invalid SELinux parameter type"
9512
9512
  msgstr ""
9513
9513
 
9514
- #: ../lib/puppet/util/selinux.rb:100
9514
+ #: ../lib/puppet/util/selinux.rb:104
9515
9515
  msgid "Can't set SELinux context on file unless the file already has some kind of context"
9516
9516
  msgstr ""
9517
9517
 
9518
- #: ../lib/puppet/util/selinux.rb:114
9518
+ #: ../lib/puppet/util/selinux.rb:118
9519
9519
  msgid "set_selinux_context component must be one of :seluser, :selrole, :seltype, or :selrange"
9520
9520
  msgstr ""
9521
9521
 
9522
- #: ../lib/puppet/util/selinux.rb:125
9522
+ #: ../lib/puppet/util/selinux.rb:129
9523
9523
  msgid "Failed to set SELinux context %{context} on %{file}"
9524
9524
  msgstr ""
9525
9525
 
9526
- #: ../lib/puppet/util/selinux.rb:176
9526
+ #: ../lib/puppet/util/selinux.rb:180
9527
9527
  msgid "Could not open SELinux category translation file %{path}."
9528
9528
  msgstr ""
9529
9529
 
9530
- #: ../lib/puppet/util/selinux.rb:244
9530
+ #: ../lib/puppet/util/selinux.rb:248
9531
9531
  msgid "got a relative path in SELinux find_fs: %{path}"
9532
9532
  msgstr ""
9533
9533
 
@@ -9812,72 +9812,72 @@ msgid "Failed to get volume information"
9812
9812
  msgstr ""
9813
9813
 
9814
9814
  #. TRANSLATORS 'SYSTEM' is a Windows name and should not be translated
9815
- #: ../lib/puppet/util/windows/security.rb:337
9815
+ #: ../lib/puppet/util/windows/security.rb:339
9816
9816
  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"
9817
9817
  msgstr ""
9818
9818
 
9819
9819
  #. TRANSLATORS 'SYSTEM' is a Windows name and should not be translated
9820
- #: ../lib/puppet/util/windows/security.rb:340
9820
+ #: ../lib/puppet/util/windows/security.rb:342
9821
9821
  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"
9822
9822
  msgstr ""
9823
9823
 
9824
9824
  #. TRANSLATORS 'SYSTEM' is a Windows name and should not be translated
9825
- #: ../lib/puppet/util/windows/security.rb:343
9825
+ #: ../lib/puppet/util/windows/security.rb:345
9826
9826
  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"
9827
9827
  msgstr ""
9828
9828
 
9829
9829
  #. TRANSLATORS 'SYSTEM' is a Windows name and should not be translated
9830
- #: ../lib/puppet/util/windows/security.rb:353
9830
+ #: ../lib/puppet/util/windows/security.rb:355
9831
9831
  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"
9832
9832
  msgstr ""
9833
9833
 
9834
9834
  #. TRANSLATORS 'SYSTEM' is a Windows name and should not be translated
9835
- #: ../lib/puppet/util/windows/security.rb:356
9835
+ #: ../lib/puppet/util/windows/security.rb:358
9836
9836
  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"
9837
9837
  msgstr ""
9838
9838
 
9839
9839
  #. TRANSLATORS 'SYSTEM' is a Windows name and should not be translated
9840
- #: ../lib/puppet/util/windows/security.rb:359
9840
+ #: ../lib/puppet/util/windows/security.rb:361
9841
9841
  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"
9842
9842
  msgstr ""
9843
9843
 
9844
- #: ../lib/puppet/util/windows/security.rb:430 ../lib/puppet/util/windows/security.rb:447 ../lib/puppet/util/windows/sid.rb:154 ../lib/puppet/util/windows/sid.rb:216 ../lib/puppet/util/windows/user.rb:43
9844
+ #: ../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
9845
9845
  msgid "Invalid SID"
9846
9846
  msgstr ""
9847
9847
 
9848
- #: ../lib/puppet/util/windows/security.rb:434 ../lib/puppet/util/windows/security.rb:451
9848
+ #: ../lib/puppet/util/windows/security.rb:436 ../lib/puppet/util/windows/security.rb:453
9849
9849
  msgid "Failed to add access control entry"
9850
9850
  msgstr ""
9851
9851
 
9852
- #: ../lib/puppet/util/windows/security.rb:462 ../lib/puppet/util/windows/security.rb:644
9852
+ #: ../lib/puppet/util/windows/security.rb:464 ../lib/puppet/util/windows/security.rb:646
9853
9853
  msgid "Invalid DACL"
9854
9854
  msgstr ""
9855
9855
 
9856
- #: ../lib/puppet/util/windows/security.rb:485
9856
+ #: ../lib/puppet/util/windows/security.rb:487
9857
9857
  msgid "Unsupported access control entry type: 0x%{type}"
9858
9858
  msgstr ""
9859
9859
 
9860
- #: ../lib/puppet/util/windows/security.rb:519
9860
+ #: ../lib/puppet/util/windows/security.rb:521
9861
9861
  msgid "Failed to open '%{path}'"
9862
9862
  msgstr ""
9863
9863
 
9864
- #: ../lib/puppet/util/windows/security.rb:566
9864
+ #: ../lib/puppet/util/windows/security.rb:568
9865
9865
  msgid "Failed to adjust process privileges"
9866
9866
  msgstr ""
9867
9867
 
9868
- #: ../lib/puppet/util/windows/security.rb:596
9868
+ #: ../lib/puppet/util/windows/security.rb:598
9869
9869
  msgid "Failed to get security information"
9870
9870
  msgstr ""
9871
9871
 
9872
- #: ../lib/puppet/util/windows/security.rb:607
9872
+ #: ../lib/puppet/util/windows/security.rb:609
9873
9873
  msgid "Failed to get security descriptor control"
9874
9874
  msgstr ""
9875
9875
 
9876
- #: ../lib/puppet/util/windows/security.rb:640
9876
+ #: ../lib/puppet/util/windows/security.rb:642
9877
9877
  msgid "Failed to initialize ACL"
9878
9878
  msgstr ""
9879
9879
 
9880
- #: ../lib/puppet/util/windows/security.rb:679
9880
+ #: ../lib/puppet/util/windows/security.rb:681
9881
9881
  msgid "Failed to set security information"
9882
9882
  msgstr ""
9883
9883
 
@@ -9993,19 +9993,19 @@ msgstr ""
9993
9993
  msgid "Timed out while waiting for the pending transition from %{pending_state} to %{final_state} to finish. The current state is %{current_state}."
9994
9994
  msgstr ""
9995
9995
 
9996
- #: ../lib/puppet/util/windows/sid.rb:93
9996
+ #: ../lib/puppet/util/windows/sid.rb:94
9997
9997
  msgid "Octet string must be an array of bytes"
9998
9998
  msgstr ""
9999
9999
 
10000
- #: ../lib/puppet/util/windows/sid.rb:160
10000
+ #: ../lib/puppet/util/windows/sid.rb:161
10001
10001
  msgid "Failed to convert binary SID"
10002
10002
  msgstr ""
10003
10003
 
10004
- #: ../lib/puppet/util/windows/sid.rb:165
10004
+ #: ../lib/puppet/util/windows/sid.rb:166
10005
10005
  msgid "ConvertSidToStringSidW failed to allocate buffer for sid"
10006
10006
  msgstr ""
10007
10007
 
10008
- #: ../lib/puppet/util/windows/sid.rb:185
10008
+ #: ../lib/puppet/util/windows/sid.rb:186
10009
10009
  msgid "Failed to convert string SID: %{string_sid}"
10010
10010
  msgstr ""
10011
10011
 
@@ -10079,26 +10079,26 @@ msgstr ""
10079
10079
  msgid "Failed to load private key for '%{name}'"
10080
10080
  msgstr ""
10081
10081
 
10082
- #: ../lib/puppet/x509/cert_provider.rb:233
10082
+ #: ../lib/puppet/x509/cert_provider.rb:231
10083
10083
  msgid "Failed to save client certificate for '%{name}'"
10084
10084
  msgstr ""
10085
10085
 
10086
- #: ../lib/puppet/x509/cert_provider.rb:248
10086
+ #: ../lib/puppet/x509/cert_provider.rb:246
10087
10087
  msgid "The client certificate is missing from '%{path}'"
10088
10088
  msgstr ""
10089
10089
 
10090
- #: ../lib/puppet/x509/cert_provider.rb:252
10090
+ #: ../lib/puppet/x509/cert_provider.rb:250
10091
10091
  msgid "Failed to load client certificate for '%{name}'"
10092
10092
  msgstr ""
10093
10093
 
10094
- #: ../lib/puppet/x509/cert_provider.rb:298
10094
+ #: ../lib/puppet/x509/cert_provider.rb:296
10095
10095
  msgid "Failed to save certificate request for '%{name}'"
10096
10096
  msgstr ""
10097
10097
 
10098
- #: ../lib/puppet/x509/cert_provider.rb:313
10098
+ #: ../lib/puppet/x509/cert_provider.rb:311
10099
10099
  msgid "Failed to load certificate request for '%{name}'"
10100
10100
  msgstr ""
10101
10101
 
10102
- #: ../lib/puppet/x509/cert_provider.rb:324
10102
+ #: ../lib/puppet/x509/cert_provider.rb:322
10103
10103
  msgid "Failed to delete certificate request for '%{name}'"
10104
10104
  msgstr ""