puppet 7.1.0-universal-darwin → 7.6.1-universal-darwin

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 (198) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile.lock +38 -30
  3. data/ext/build_defaults.yaml +0 -1
  4. data/lib/puppet/application.rb +10 -6
  5. data/lib/puppet/application/agent.rb +1 -0
  6. data/lib/puppet/application/apply.rb +3 -2
  7. data/lib/puppet/application/device.rb +1 -0
  8. data/lib/puppet/application/script.rb +1 -0
  9. data/lib/puppet/application/ssl.rb +11 -0
  10. data/lib/puppet/configurer.rb +16 -3
  11. data/lib/puppet/defaults.rb +14 -19
  12. data/lib/puppet/environments.rb +16 -1
  13. data/lib/puppet/face/facts.rb +26 -2
  14. data/lib/puppet/ffi/windows/api_types.rb +1 -1
  15. data/lib/puppet/ffi/windows/constants.rb +1 -1
  16. data/lib/puppet/file_serving/configuration/parser.rb +5 -2
  17. data/lib/puppet/file_system/memory_file.rb +8 -1
  18. data/lib/puppet/file_system/windows.rb +2 -0
  19. data/lib/puppet/functions.rb +1 -1
  20. data/lib/puppet/functions/partition.rb +8 -0
  21. data/lib/puppet/http/factory.rb +4 -0
  22. data/lib/puppet/indirector/facts/facter.rb +1 -0
  23. data/lib/puppet/loaders.rb +0 -4
  24. data/lib/puppet/module.rb +1 -0
  25. data/lib/puppet/module_tool/applications/installer.rb +48 -2
  26. data/lib/puppet/module_tool/errors/shared.rb +17 -2
  27. data/lib/puppet/network/formats.rb +67 -0
  28. data/lib/puppet/network/http.rb +5 -2
  29. data/lib/puppet/network/http/api.rb +10 -6
  30. data/lib/puppet/network/http/api/master.rb +3 -2
  31. data/lib/puppet/network/http/api/master/v3.rb +2 -25
  32. data/lib/puppet/network/http/api/master/v3/environments.rb +2 -33
  33. data/lib/puppet/network/http/api/server.rb +10 -0
  34. data/lib/puppet/network/http/api/server/v3.rb +39 -0
  35. data/lib/puppet/network/http/api/server/v3/environments.rb +48 -0
  36. data/lib/puppet/node/environment.rb +12 -5
  37. data/lib/puppet/parser/ast/leaf.rb +3 -2
  38. data/lib/puppet/pops/evaluator/deferred_resolver.rb +5 -3
  39. data/lib/puppet/pops/loader/base_loader.rb +42 -32
  40. data/lib/puppet/pops/loader/dependency_loader.rb +2 -2
  41. data/lib/puppet/pops/loader/loader.rb +15 -5
  42. data/lib/puppet/pops/loader/module_loaders.rb +8 -8
  43. data/lib/puppet/pops/loader/predefined_loader.rb +4 -0
  44. data/lib/puppet/pops/loader/runtime3_type_loader.rb +1 -1
  45. data/lib/puppet/pops/loader/static_loader.rb +4 -0
  46. data/lib/puppet/pops/loaders.rb +4 -4
  47. data/lib/puppet/pops/model/ast_transformer.rb +1 -1
  48. data/lib/puppet/pops/parser/lexer2.rb +0 -4
  49. data/lib/puppet/pops/types/p_type_set_type.rb +1 -1
  50. data/lib/puppet/pops/validation/checker4_0.rb +0 -1
  51. data/lib/puppet/property/list.rb +1 -1
  52. data/lib/puppet/provider/group/groupadd.rb +13 -8
  53. data/lib/puppet/provider/package/apt.rb +34 -2
  54. data/lib/puppet/provider/package/aptitude.rb +6 -0
  55. data/lib/puppet/provider/package/dnfmodule.rb +1 -1
  56. data/lib/puppet/provider/package/puppet_gem.rb +12 -1
  57. data/lib/puppet/provider/service/debian.rb +2 -0
  58. data/lib/puppet/provider/service/systemd.rb +1 -1
  59. data/lib/puppet/provider/user/useradd.rb +62 -8
  60. data/lib/puppet/reference/configuration.rb +6 -5
  61. data/lib/puppet/settings.rb +36 -30
  62. data/lib/puppet/settings/alias_setting.rb +37 -0
  63. data/lib/puppet/settings/environment_conf.rb +1 -0
  64. data/lib/puppet/type/package.rb +3 -3
  65. data/lib/puppet/util/autoload.rb +1 -8
  66. data/lib/puppet/util/monkey_patches.rb +7 -0
  67. data/lib/puppet/util/posix.rb +1 -1
  68. data/lib/puppet/util/windows/adsi.rb +46 -0
  69. data/lib/puppet/util/windows/principal.rb +9 -2
  70. data/lib/puppet/util/windows/sid.rb +4 -2
  71. data/lib/puppet/version.rb +1 -1
  72. data/locales/puppet.pot +166 -146
  73. data/man/man5/puppet.conf.5 +14 -6
  74. data/man/man8/puppet-agent.8 +2 -2
  75. data/man/man8/puppet-apply.8 +2 -2
  76. data/man/man8/puppet-catalog.8 +1 -1
  77. data/man/man8/puppet-config.8 +1 -1
  78. data/man/man8/puppet-describe.8 +1 -1
  79. data/man/man8/puppet-device.8 +2 -2
  80. data/man/man8/puppet-doc.8 +1 -1
  81. data/man/man8/puppet-epp.8 +1 -1
  82. data/man/man8/puppet-facts.8 +8 -2
  83. data/man/man8/puppet-filebucket.8 +1 -1
  84. data/man/man8/puppet-generate.8 +1 -1
  85. data/man/man8/puppet-help.8 +1 -1
  86. data/man/man8/puppet-lookup.8 +1 -1
  87. data/man/man8/puppet-module.8 +1 -1
  88. data/man/man8/puppet-node.8 +1 -1
  89. data/man/man8/puppet-parser.8 +1 -1
  90. data/man/man8/puppet-plugin.8 +1 -1
  91. data/man/man8/puppet-report.8 +1 -1
  92. data/man/man8/puppet-resource.8 +1 -1
  93. data/man/man8/puppet-script.8 +2 -2
  94. data/man/man8/puppet-ssl.8 +5 -1
  95. data/man/man8/puppet.8 +2 -2
  96. data/spec/fixtures/integration/application/agent/cached_deferred_catalog.json +91 -0
  97. data/spec/fixtures/unit/provider/service/systemd/list_unit_files_services_vendor_preset +9 -0
  98. data/spec/integration/application/agent_spec.rb +160 -3
  99. data/spec/integration/application/apply_spec.rb +19 -0
  100. data/spec/integration/application/plugin_spec.rb +1 -1
  101. data/spec/integration/defaults_spec.rb +0 -7
  102. data/spec/integration/http/client_spec.rb +12 -0
  103. data/spec/integration/indirector/direct_file_server_spec.rb +1 -3
  104. data/spec/integration/indirector/file_content/file_server_spec.rb +0 -2
  105. data/spec/integration/indirector/file_metadata/file_server_spec.rb +0 -2
  106. data/spec/integration/parser/collection_spec.rb +10 -0
  107. data/spec/integration/resource/type_collection_spec.rb +2 -6
  108. data/spec/integration/transaction_spec.rb +4 -9
  109. data/spec/integration/util/windows/adsi_spec.rb +21 -1
  110. data/spec/integration/util/windows/principal_spec.rb +21 -0
  111. data/spec/integration/util/windows/registry_spec.rb +6 -10
  112. data/spec/spec_helper.rb +12 -5
  113. data/spec/unit/agent_spec.rb +8 -6
  114. data/spec/unit/application/agent_spec.rb +0 -1
  115. data/spec/unit/application/facts_spec.rb +58 -7
  116. data/spec/unit/application/filebucket_spec.rb +0 -2
  117. data/spec/unit/application/ssl_spec.rb +23 -0
  118. data/spec/unit/application_spec.rb +17 -9
  119. data/spec/unit/confine/feature_spec.rb +1 -1
  120. data/spec/unit/confine_spec.rb +8 -2
  121. data/spec/unit/environments_spec.rb +164 -88
  122. data/spec/unit/face/node_spec.rb +0 -11
  123. data/spec/unit/file_serving/configuration/parser_spec.rb +8 -1
  124. data/spec/unit/file_serving/metadata_spec.rb +3 -3
  125. data/spec/unit/file_serving/terminus_helper_spec.rb +11 -4
  126. data/spec/unit/file_system_spec.rb +9 -0
  127. data/spec/unit/forge/module_release_spec.rb +2 -7
  128. data/spec/unit/http/factory_spec.rb +19 -0
  129. data/spec/unit/indirector/face_spec.rb +0 -1
  130. data/spec/unit/indirector/facts/facter_spec.rb +20 -5
  131. data/spec/unit/indirector/file_bucket_file/selector_spec.rb +26 -8
  132. data/spec/unit/indirector/indirection_spec.rb +8 -12
  133. data/spec/unit/indirector_spec.rb +2 -2
  134. data/spec/unit/module_spec.rb +1 -1
  135. data/spec/unit/module_tool/applications/installer_spec.rb +66 -0
  136. data/spec/unit/network/formats_spec.rb +41 -0
  137. data/spec/unit/network/http/api/indirected_routes_spec.rb +0 -4
  138. data/spec/unit/network/http/api/master_spec.rb +38 -0
  139. data/spec/unit/network/http/api/{master → server}/v3/environments_spec.rb +2 -2
  140. data/spec/unit/network/http/api/{master → server}/v3_spec.rb +19 -19
  141. data/spec/unit/network/http/api_spec.rb +11 -11
  142. data/spec/unit/parser/compiler_spec.rb +3 -19
  143. data/spec/unit/parser/resource_spec.rb +14 -8
  144. data/spec/unit/pops/evaluator/deferred_resolver_spec.rb +20 -0
  145. data/spec/unit/pops/loaders/dependency_loader_spec.rb +1 -1
  146. data/spec/unit/pops/parser/lexer2_spec.rb +0 -4
  147. data/spec/unit/pops/types/type_parser_spec.rb +2 -1
  148. data/spec/unit/pops/validator/validator_spec.rb +20 -43
  149. data/spec/unit/property_spec.rb +1 -0
  150. data/spec/unit/provider/group/groupadd_spec.rb +5 -2
  151. data/spec/unit/provider/nameservice_spec.rb +66 -65
  152. data/spec/unit/provider/package/apt_spec.rb +28 -23
  153. data/spec/unit/provider/package/aptitude_spec.rb +1 -1
  154. data/spec/unit/provider/package/base_spec.rb +6 -5
  155. data/spec/unit/provider/package/dnfmodule_spec.rb +10 -1
  156. data/spec/unit/provider/package/pacman_spec.rb +18 -12
  157. data/spec/unit/provider/package/pip_spec.rb +6 -11
  158. data/spec/unit/provider/package/pkgdmg_spec.rb +0 -4
  159. data/spec/unit/provider/package/puppet_gem_spec.rb +28 -0
  160. data/spec/unit/provider/service/systemd_spec.rb +11 -0
  161. data/spec/unit/provider/user/hpux_spec.rb +1 -1
  162. data/spec/unit/provider/user/useradd_spec.rb +70 -3
  163. data/spec/unit/provider_spec.rb +6 -8
  164. data/spec/unit/resource/type_spec.rb +1 -1
  165. data/spec/unit/resource_spec.rb +11 -10
  166. data/spec/unit/settings_spec.rb +13 -6
  167. data/spec/unit/ssl/base_spec.rb +0 -1
  168. data/spec/unit/ssl/certificate_request_spec.rb +4 -10
  169. data/spec/unit/ssl/ssl_provider_spec.rb +5 -2
  170. data/spec/unit/transaction/additional_resource_generator_spec.rb +3 -7
  171. data/spec/unit/transaction/event_manager_spec.rb +14 -11
  172. data/spec/unit/transaction_spec.rb +13 -4
  173. data/spec/unit/type/file/content_spec.rb +0 -1
  174. data/spec/unit/type/file/selinux_spec.rb +0 -2
  175. data/spec/unit/type/file_spec.rb +0 -6
  176. data/spec/unit/type/group_spec.rb +13 -6
  177. data/spec/unit/type/resources_spec.rb +7 -7
  178. data/spec/unit/type/service_spec.rb +1 -1
  179. data/spec/unit/type/tidy_spec.rb +0 -1
  180. data/spec/unit/type_spec.rb +2 -2
  181. data/spec/unit/util/at_fork_spec.rb +2 -2
  182. data/spec/unit/util/autoload_spec.rb +5 -1
  183. data/spec/unit/util/backups_spec.rb +1 -2
  184. data/spec/unit/util/execution_spec.rb +15 -11
  185. data/spec/unit/util/inifile_spec.rb +6 -14
  186. data/spec/unit/util/log_spec.rb +8 -7
  187. data/spec/unit/util/logging_spec.rb +3 -3
  188. data/spec/unit/util/posix_spec.rb +16 -10
  189. data/spec/unit/util/selinux_spec.rb +76 -52
  190. data/spec/unit/util/suidmanager_spec.rb +44 -41
  191. data/spec/unit/util/windows/sid_spec.rb +6 -0
  192. data/spec/unit/util_spec.rb +13 -6
  193. metadata +18 -16
  194. data/spec/lib/matchers/include.rb +0 -27
  195. data/spec/lib/matchers/include_spec.rb +0 -32
  196. data/spec/unit/pops/parser/parse_application_spec.rb +0 -13
  197. data/spec/unit/pops/parser/parse_capabilities_spec.rb +0 -23
  198. data/spec/unit/pops/parser/parse_site_spec.rb +0 -43
@@ -32,6 +32,13 @@ end
32
32
  # (#19151) Reject all SSLv2 ciphers and handshakes
33
33
  require 'puppet/ssl/openssl_loader'
34
34
  unless Puppet::Util::Platform.jruby_fips?
35
+ unless defined?(OpenSSL::SSL::TLS1_VERSION)
36
+ module OpenSSL::SSL
37
+ # see https://github.com/ruby/ruby/commit/609103dbb5fb182eec12f052226c43e39b907682#diff-09f822c26289f5347111795ca22ed7ed1cfadd6ebd28f987991d1d414eef565aR2755-R2759
38
+ OpenSSL::SSL::TLS1_VERSION = 0x301
39
+ end
40
+ end
41
+
35
42
  class OpenSSL::SSL::SSLContext
36
43
  if DEFAULT_PARAMS[:options]
37
44
  DEFAULT_PARAMS[:options] |= OpenSSL::SSL::OP_NO_SSLv2 | OpenSSL::SSL::OP_NO_SSLv3
@@ -23,7 +23,7 @@ module Puppet::Util::POSIX
23
23
  groups << group.name if group.mem.include?(user)
24
24
  end
25
25
  end
26
-
26
+
27
27
  uniq_groups = groups.uniq
28
28
  if uniq_groups != groups
29
29
  Puppet.debug(_('Removing any duplicate group entries'))
@@ -504,6 +504,43 @@ module Puppet::Util::Windows::ADSI
504
504
  user_name
505
505
  end
506
506
 
507
+ # https://docs.microsoft.com/en-us/windows/win32/api/secext/ne-secext-extended_name_format
508
+ NameUnknown = 0
509
+ NameFullyQualifiedDN = 1
510
+ NameSamCompatible = 2
511
+ NameDisplay = 3
512
+ NameUniqueId = 6
513
+ NameCanonical = 7
514
+ NameUserPrincipal = 8
515
+ NameCanonicalEx = 9
516
+ NameServicePrincipal = 10
517
+ NameDnsDomain = 12
518
+ NameGivenName = 13
519
+ NameSurname = 14
520
+
521
+ def self.current_user_name_with_format(format)
522
+ user_name = ''
523
+ max_length = 1024
524
+
525
+ FFI::MemoryPointer.new(:lpwstr, max_length * 2 + 1) do |buffer|
526
+ FFI::MemoryPointer.new(:dword, 1) do |buffer_size|
527
+ buffer_size.write_dword(max_length + 1)
528
+
529
+ if GetUserNameExW(format.to_i, buffer, buffer_size) == FFI::WIN32_FALSE
530
+ raise Puppet::Util::Windows::Error.new(_("Failed to get user name"), FFI.errno)
531
+ end
532
+
533
+ user_name = buffer.read_wide_string(buffer_size.read_dword).chomp
534
+ end
535
+ end
536
+
537
+ user_name
538
+ end
539
+
540
+ def self.current_sam_compatible_user_name
541
+ current_user_name_with_format(NameSamCompatible)
542
+ end
543
+
507
544
  def self.current_user_sid
508
545
  Puppet::Util::Windows::SID.name_to_principal(current_user_name)
509
546
  end
@@ -518,6 +555,15 @@ module Puppet::Util::Windows::ADSI
518
555
  ffi_lib :advapi32
519
556
  attach_function_private :GetUserNameW,
520
557
  [:lpwstr, :lpdword], :win32_bool
558
+
559
+ # https://docs.microsoft.com/en-us/windows/win32/api/secext/nf-secext-getusernameexa
560
+ # BOOLEAN SEC_ENTRY GetUserNameExA(
561
+ # EXTENDED_NAME_FORMAT NameFormat,
562
+ # LPSTR lpNameBuffer,
563
+ # PULONG nSize
564
+ # );type
565
+ ffi_lib :secur32
566
+ attach_function_private :GetUserNameExW, [:uint16, :lpwstr, :pointer], :win32_bool
521
567
  end
522
568
 
523
569
  class UserProfile
@@ -44,7 +44,8 @@ module Puppet::Util::Windows::SID
44
44
  ERROR_INVALID_PARAMETER = 87
45
45
  ERROR_INSUFFICIENT_BUFFER = 122
46
46
 
47
- def self.lookup_account_name(system_name = nil, account_name)
47
+ def self.lookup_account_name(system_name = nil, sanitize = true, account_name)
48
+ account_name = sanitize_account_name(account_name) if sanitize
48
49
  system_name_ptr = FFI::Pointer::NULL
49
50
  begin
50
51
  if system_name
@@ -146,6 +147,13 @@ module Puppet::Util::Windows::SID
146
147
  end
147
148
  end
148
149
 
150
+ # Sanitize the given account name for lookup to avoid known issues
151
+ def self.sanitize_account_name(account_name)
152
+ return account_name unless account_name.start_with?('APPLICATION PACKAGE AUTHORITY\\')
153
+ account_name.split('\\').last
154
+ end
155
+ private_class_method :sanitize_account_name
156
+
149
157
  ffi_convention :stdcall
150
158
 
151
159
  # https://msdn.microsoft.com/en-us/library/windows/desktop/aa379601(v=vs.85).aspx
@@ -191,4 +199,3 @@ module Puppet::Util::Windows::SID
191
199
  [:lpcwstr, :pointer, :lpwstr, :lpdword, :lpwstr, :lpdword, :pointer], :win32_bool
192
200
  end
193
201
  end
194
-
@@ -74,11 +74,13 @@ module Puppet::Util::Windows
74
74
  string_to_sid_ptr(name) do |sid_ptr|
75
75
  raw_sid_bytes = sid_ptr.read_array_of_uchar(get_length_sid(sid_ptr))
76
76
  end
77
- rescue
77
+ rescue => e
78
+ Puppet.debug("Could not retrieve raw SID bytes from '#{name}': #{e.message}")
78
79
  end
79
80
 
80
81
  raw_sid_bytes ? Principal.lookup_account_sid(raw_sid_bytes) : Principal.lookup_account_name(name)
81
- rescue
82
+ rescue => e
83
+ Puppet.debug("#{e.message}")
82
84
  (allow_unresolved && raw_sid_bytes) ? unresolved_principal(name, raw_sid_bytes) : nil
83
85
  end
84
86
  module_function :name_to_principal
@@ -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 = '7.1.0'
9
+ PUPPETVERSION = '7.6.1'
10
10
 
11
11
  ##
12
12
  # version is a public API method intended to always provide a fast and
data/locales/puppet.pot CHANGED
@@ -1,16 +1,16 @@
1
1
  # SOME DESCRIPTIVE TITLE.
2
- # Copyright (C) 2020 Puppet, Inc.
2
+ # Copyright (C) 2021 Puppet, Inc.
3
3
  # This file is distributed under the same license as the Puppet automation framework package.
4
- # FIRST AUTHOR <EMAIL@ADDRESS>, 2020.
4
+ # FIRST AUTHOR <EMAIL@ADDRESS>, 2021.
5
5
  #
6
6
  #, fuzzy
7
7
  msgid ""
8
8
  msgstr ""
9
- "Project-Id-Version: Puppet automation framework 6.19.1-404-g6fd33ed69c\n"
9
+ "Project-Id-Version: Puppet automation framework 7.3.0-6-g7c55ccd544\n"
10
10
  "\n"
11
11
  "Report-Msgid-Bugs-To: https://tickets.puppetlabs.com\n"
12
- "POT-Creation-Date: 2020-10-29 10:41+0000\n"
13
- "PO-Revision-Date: 2020-10-29 10:41+0000\n"
12
+ "POT-Creation-Date: 2021-01-21 13:07+0000\n"
13
+ "PO-Revision-Date: 2021-01-21 13:07+0000\n"
14
14
  "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
15
15
  "Language-Team: LANGUAGE <LL@li.org>\n"
16
16
  "Language: \n"
@@ -168,11 +168,11 @@ msgstr ""
168
168
  msgid "No valid command or main"
169
169
  msgstr ""
170
170
 
171
- #: ../lib/puppet/application.rb:483
171
+ #: ../lib/puppet/application.rb:486
172
172
  msgid "Could not set logdest to %{dest}."
173
173
  msgstr ""
174
174
 
175
- #: ../lib/puppet/application.rb:576
175
+ #: ../lib/puppet/application.rb:580
176
176
  msgid "No help available for puppet %{app_name}"
177
177
  msgstr ""
178
178
 
@@ -184,19 +184,19 @@ msgstr ""
184
184
  msgid "The puppet agent daemon"
185
185
  msgstr ""
186
186
 
187
- #: ../lib/puppet/application/agent.rb:414
187
+ #: ../lib/puppet/application/agent.rb:415
188
188
  msgid "Fingerprint asked but neither the certificate, nor the certificate request have been issued"
189
189
  msgstr ""
190
190
 
191
- #: ../lib/puppet/application/agent.rb:419
191
+ #: ../lib/puppet/application/agent.rb:420
192
192
  msgid "Failed to generate fingerprint: %{message}"
193
193
  msgstr ""
194
194
 
195
- #: ../lib/puppet/application/agent.rb:442
195
+ #: ../lib/puppet/application/agent.rb:443
196
196
  msgid "Starting Puppet client version %{version}"
197
197
  msgstr ""
198
198
 
199
- #: ../lib/puppet/application/agent.rb:458
199
+ #: ../lib/puppet/application/agent.rb:459
200
200
  msgid "The puppet agent command does not take parameters"
201
201
  msgstr ""
202
202
 
@@ -206,35 +206,35 @@ msgstr ""
206
206
 
207
207
  #. TRANSLATORS "puppet apply" is a program command and should not be translated
208
208
  #. TRANSLATORS "puppet apply" is a program command and should not be translated
209
- #: ../lib/puppet/application/apply.rb:207 ../lib/puppet/application/apply.rb:320
209
+ #: ../lib/puppet/application/apply.rb:208 ../lib/puppet/application/apply.rb:321
210
210
  msgid "For puppet apply"
211
211
  msgstr ""
212
212
 
213
- #: ../lib/puppet/application/apply.rb:215
213
+ #: ../lib/puppet/application/apply.rb:216
214
214
  msgid "%{file} is not readable"
215
215
  msgstr ""
216
216
 
217
- #: ../lib/puppet/application/apply.rb:286 ../lib/puppet/application/script.rb:239
217
+ #: ../lib/puppet/application/apply.rb:287 ../lib/puppet/application/script.rb:240
218
218
  msgid "Exiting"
219
219
  msgstr ""
220
220
 
221
- #: ../lib/puppet/application/apply.rb:330
221
+ #: ../lib/puppet/application/apply.rb:331
222
222
  msgid "Could not deserialize catalog from %{format}: %{detail}"
223
223
  msgstr ""
224
224
 
225
- #: ../lib/puppet/application/apply.rb:351 ../lib/puppet/application/script.rb:144
225
+ #: ../lib/puppet/application/apply.rb:352 ../lib/puppet/application/script.rb:145
226
226
  msgid "Could not find facts for %{node}"
227
227
  msgstr ""
228
228
 
229
- #: ../lib/puppet/application/apply.rb:363 ../lib/puppet/application/script.rb:152
229
+ #: ../lib/puppet/application/apply.rb:364 ../lib/puppet/application/script.rb:153
230
230
  msgid "Could not find node %{node}"
231
231
  msgstr ""
232
232
 
233
- #: ../lib/puppet/application/apply.rb:376 ../lib/puppet/application/script.rb:137
233
+ #: ../lib/puppet/application/apply.rb:377 ../lib/puppet/application/script.rb:138
234
234
  msgid "Could not find file %{manifest}"
235
235
  msgstr ""
236
236
 
237
- #: ../lib/puppet/application/apply.rb:377
237
+ #: ../lib/puppet/application/apply.rb:378
238
238
  msgid "Only one file can be applied per run. Skipping %{files}"
239
239
  msgstr ""
240
240
 
@@ -246,47 +246,47 @@ msgstr ""
246
246
  msgid "Manage remote network devices"
247
247
  msgstr ""
248
248
 
249
- #: ../lib/puppet/application/device.rb:230
249
+ #: ../lib/puppet/application/device.rb:231
250
250
  msgid "resource command requires target"
251
251
  msgstr ""
252
252
 
253
- #: ../lib/puppet/application/device.rb:233
253
+ #: ../lib/puppet/application/device.rb:234
254
254
  msgid "facts command requires target"
255
255
  msgstr ""
256
256
 
257
- #: ../lib/puppet/application/device.rb:236
257
+ #: ../lib/puppet/application/device.rb:237
258
258
  msgid "missing argument: --target is required when using --apply"
259
259
  msgstr ""
260
260
 
261
- #: ../lib/puppet/application/device.rb:237
261
+ #: ../lib/puppet/application/device.rb:238
262
262
  msgid "%{file} does not exist, cannot apply"
263
263
  msgstr ""
264
264
 
265
- #: ../lib/puppet/application/device.rb:255
265
+ #: ../lib/puppet/application/device.rb:256
266
266
  msgid "Target device / certificate '%{target}' not found in %{config}"
267
267
  msgstr ""
268
268
 
269
- #: ../lib/puppet/application/device.rb:257
269
+ #: ../lib/puppet/application/device.rb:258
270
270
  msgid "No device found in %{config}"
271
271
  msgstr ""
272
272
 
273
- #: ../lib/puppet/application/device.rb:314
273
+ #: ../lib/puppet/application/device.rb:315
274
274
  msgid "retrieving resource: %{resource} from %{target} at %{scheme}%{url_host}%{port}%{url_path}"
275
275
  msgstr ""
276
276
 
277
- #: ../lib/puppet/application/device.rb:329
277
+ #: ../lib/puppet/application/device.rb:330
278
278
  msgid "retrieving facts from %{target} at %{scheme}%{url_host}%{port}%{url_path}"
279
279
  msgstr ""
280
280
 
281
- #: ../lib/puppet/application/device.rb:352
281
+ #: ../lib/puppet/application/device.rb:353
282
282
  msgid "starting applying configuration to %{target} at %{scheme}%{url_host}%{port}%{url_path}"
283
283
  msgstr ""
284
284
 
285
- #: ../lib/puppet/application/device.rb:388 ../lib/puppet/application/resource.rb:196
285
+ #: ../lib/puppet/application/device.rb:389 ../lib/puppet/application/resource.rb:196
286
286
  msgid "You must specify the type to display"
287
287
  msgstr ""
288
288
 
289
- #: ../lib/puppet/application/device.rb:389 ../lib/puppet/application/resource.rb:197
289
+ #: ../lib/puppet/application/device.rb:390 ../lib/puppet/application/resource.rb:197
290
290
  msgid "Could not find type %{type}"
291
291
  msgstr ""
292
292
 
@@ -434,11 +434,11 @@ msgstr ""
434
434
  msgid "Run a puppet manifests as a script without compiling a catalog"
435
435
  msgstr ""
436
436
 
437
- #: ../lib/puppet/application/script.rb:124
437
+ #: ../lib/puppet/application/script.rb:125
438
438
  msgid "Bolt must be installed to use the script application"
439
439
  msgstr ""
440
440
 
441
- #: ../lib/puppet/application/script.rb:138
441
+ #: ../lib/puppet/application/script.rb:139
442
442
  msgid "Only one file can be used per run. Skipping %{files}"
443
443
  msgstr ""
444
444
 
@@ -583,44 +583,44 @@ msgstr ""
583
583
  msgid "Local environment: '%{local_env}' doesn't match server specified environment '%{catalog_env}', restarting agent run with environment '%{catalog_env}'"
584
584
  msgstr ""
585
585
 
586
- #: ../lib/puppet/configurer.rb:421
586
+ #: ../lib/puppet/configurer.rb:434
587
587
  msgid "Failed to apply catalog: %{detail}"
588
588
  msgstr ""
589
589
 
590
- #: ../lib/puppet/configurer.rb:450 ../lib/puppet/http/resolver/server_list.rb:63
590
+ #: ../lib/puppet/configurer.rb:463 ../lib/puppet/http/resolver/server_list.rb:63
591
591
  msgid "Puppet server %{host}:%{port} is unavailable: %{code} %{reason}"
592
592
  msgstr ""
593
593
 
594
594
  #. TRANSLATORS 'server_list' is the name of a setting and should not be translated
595
- #: ../lib/puppet/configurer.rb:454 ../lib/puppet/http/resolver/server_list.rb:66
595
+ #: ../lib/puppet/configurer.rb:467 ../lib/puppet/http/resolver/server_list.rb:66
596
596
  msgid "Unable to connect to server from server_list setting: %{detail}"
597
597
  msgstr ""
598
598
 
599
- #: ../lib/puppet/configurer.rb:465 ../lib/puppet/face/report.rb:47
599
+ #: ../lib/puppet/configurer.rb:478 ../lib/puppet/face/report.rb:47
600
600
  msgid "Could not send report: %{detail}"
601
601
  msgstr ""
602
602
 
603
- #: ../lib/puppet/configurer.rb:474
603
+ #: ../lib/puppet/configurer.rb:487
604
604
  msgid "Could not save last run local report: %{detail}"
605
605
  msgstr ""
606
606
 
607
- #: ../lib/puppet/configurer.rb:493
607
+ #: ../lib/puppet/configurer.rb:506
608
608
  msgid "Uploading facts for %{node} to %{server}"
609
609
  msgstr ""
610
610
 
611
- #: ../lib/puppet/configurer.rb:501
611
+ #: ../lib/puppet/configurer.rb:514
612
612
  msgid "Failed to submit facts: %{detail}"
613
613
  msgstr ""
614
614
 
615
- #: ../lib/puppet/configurer.rb:516
615
+ #: ../lib/puppet/configurer.rb:529
616
616
  msgid "Could not run command from %{setting}: %{detail}"
617
617
  msgstr ""
618
618
 
619
- #: ../lib/puppet/configurer.rb:534
619
+ #: ../lib/puppet/configurer.rb:547
620
620
  msgid "Could not retrieve catalog from cache: %{detail}"
621
621
  msgstr ""
622
622
 
623
- #: ../lib/puppet/configurer.rb:555
623
+ #: ../lib/puppet/configurer.rb:568
624
624
  msgid "Could not retrieve catalog from remote server: %{detail}"
625
625
  msgstr ""
626
626
 
@@ -688,39 +688,39 @@ msgstr ""
688
688
  msgid "a data type can only have one implementation"
689
689
  msgstr ""
690
690
 
691
- #: ../lib/puppet/defaults.rb:156
691
+ #: ../lib/puppet/defaults.rb:172
692
692
  msgid "Cannot disable unrecognized warning types '%{invalid}'."
693
693
  msgstr ""
694
694
 
695
- #: ../lib/puppet/defaults.rb:157
695
+ #: ../lib/puppet/defaults.rb:173
696
696
  msgid "Valid values are '%{values}'."
697
697
  msgstr ""
698
698
 
699
699
  #. TRANSLATORS 'data_binding_terminus' is a setting and should not be translated
700
- #: ../lib/puppet/defaults.rb:522
700
+ #: ../lib/puppet/defaults.rb:538
701
701
  msgid "Setting 'data_binding_terminus' is deprecated."
702
702
  msgstr ""
703
703
 
704
704
  #. TRANSLATORS 'hiera' should not be translated
705
- #: ../lib/puppet/defaults.rb:524
705
+ #: ../lib/puppet/defaults.rb:540
706
706
  msgid "Convert custom terminus to hiera 5 API."
707
707
  msgstr ""
708
708
 
709
709
  #. TRANSLATORS 'environment_data_provider' is a setting and should not be translated
710
- #: ../lib/puppet/defaults.rb:717
710
+ #: ../lib/puppet/defaults.rb:733
711
711
  msgid "Setting 'environment_data_provider' is deprecated."
712
712
  msgstr ""
713
713
 
714
- #: ../lib/puppet/defaults.rb:802
714
+ #: ../lib/puppet/defaults.rb:818
715
715
  msgid "Certificate names must be lower case"
716
716
  msgstr ""
717
717
 
718
- #: ../lib/puppet/defaults.rb:1053 ../lib/puppet/settings/enum_setting.rb:13 ../lib/puppet/settings/symbolic_enum_setting.rb:14
718
+ #: ../lib/puppet/defaults.rb:1069 ../lib/puppet/settings/enum_setting.rb:13 ../lib/puppet/settings/symbolic_enum_setting.rb:14
719
719
  msgid "Invalid value '%{value}' for parameter %{name}. Allowed values are '%{allowed_values}'"
720
720
  msgstr ""
721
721
 
722
722
  #. TRANSLATORS 'pluginsync' is a setting and should not be translated
723
- #: ../lib/puppet/defaults.rb:1895
723
+ #: ../lib/puppet/defaults.rb:1906
724
724
  msgid "Setting 'pluginsync' is deprecated."
725
725
  msgstr ""
726
726
 
@@ -832,28 +832,28 @@ msgid ""
832
832
  "https://puppet.com/docs/puppet/latest/configuration.html#environment\n"
833
833
  msgstr ""
834
834
 
835
- #: ../lib/puppet/face/config.rb:176
835
+ #: ../lib/puppet/face/config.rb:186
836
836
  msgid "Deleted setting from '%{section_name}': '%{setting_string}', and adding it to 'server' section"
837
837
  msgstr ""
838
838
 
839
- #: ../lib/puppet/face/config.rb:191
839
+ #: ../lib/puppet/face/config.rb:201
840
840
  msgid "Delete a Puppet setting."
841
841
  msgstr ""
842
842
 
843
- #: ../lib/puppet/face/config.rb:192
843
+ #: ../lib/puppet/face/config.rb:202
844
844
  msgid "<setting>"
845
845
  msgstr ""
846
846
 
847
- #: ../lib/puppet/face/config.rb:226 ../lib/puppet/face/config.rb:230 ../lib/puppet/face/config.rb:241
847
+ #: ../lib/puppet/face/config.rb:236 ../lib/puppet/face/config.rb:240 ../lib/puppet/face/config.rb:251
848
848
  msgid "Deleted setting from '%{section_name}': '%{setting_string}'"
849
849
  msgstr ""
850
850
 
851
- #: ../lib/puppet/face/config.rb:244
851
+ #: ../lib/puppet/face/config.rb:254
852
852
  msgid "No setting found in configuration file for section '%{section_name}' setting name '%{name}'"
853
853
  msgstr ""
854
854
 
855
855
  #. TRANSLATORS the 'puppet.conf' is a specific file and should not be translated
856
- #: ../lib/puppet/face/config.rb:252
856
+ #: ../lib/puppet/face/config.rb:262
857
857
  msgid "The puppet.conf file does not exist %{puppet_conf}"
858
858
  msgstr ""
859
859
 
@@ -1059,6 +1059,14 @@ msgstr ""
1059
1059
  msgid "Show legacy facts when querying all facts."
1060
1060
  msgstr ""
1061
1061
 
1062
+ #: ../lib/puppet/face/facts.rb:132
1063
+ msgid "Show only the value when the action is called with a single query"
1064
+ msgstr ""
1065
+
1066
+ #: ../lib/puppet/face/facts.rb:136
1067
+ msgid "Show how much time it took to resolve each fact."
1068
+ msgstr ""
1069
+
1062
1070
  #: ../lib/puppet/face/generate.rb:9
1063
1071
  msgid "Generates Puppet code from Ruby definitions."
1064
1072
  msgstr ""
@@ -1358,19 +1366,19 @@ msgstr ""
1358
1366
  msgid "At least one node should be passed"
1359
1367
  msgstr ""
1360
1368
 
1361
- #: ../lib/puppet/face/node/clean.rb:64
1369
+ #: ../lib/puppet/face/node/clean.rb:72
1362
1370
  msgid "Not managing %{node} certs as this host is not a CA"
1363
1371
  msgstr ""
1364
1372
 
1365
- #: ../lib/puppet/face/node/clean.rb:71
1373
+ #: ../lib/puppet/face/node/clean.rb:79
1366
1374
  msgid "%{node}'s facts removed"
1367
1375
  msgstr ""
1368
1376
 
1369
- #: ../lib/puppet/face/node/clean.rb:77
1377
+ #: ../lib/puppet/face/node/clean.rb:85
1370
1378
  msgid "%{node}'s cached node removed"
1371
1379
  msgstr ""
1372
1380
 
1373
- #: ../lib/puppet/face/node/clean.rb:83
1381
+ #: ../lib/puppet/face/node/clean.rb:91
1374
1382
  msgid "%{node}'s reports removed"
1375
1383
  msgstr ""
1376
1384
 
@@ -1605,23 +1613,23 @@ msgstr ""
1605
1613
  msgid "Fileserver configuration file does not use '=' as a separator"
1606
1614
  msgstr ""
1607
1615
 
1608
- #: ../lib/puppet/file_serving/configuration/parser.rb:40 ../lib/puppet/util/network_device/config.rb:101
1616
+ #: ../lib/puppet/file_serving/configuration/parser.rb:43 ../lib/puppet/util/network_device/config.rb:101
1609
1617
  msgid "Invalid argument '%{var}' at %{error_location}"
1610
1618
  msgstr ""
1611
1619
 
1612
- #: ../lib/puppet/file_serving/configuration/parser.rb:45
1620
+ #: ../lib/puppet/file_serving/configuration/parser.rb:48
1613
1621
  msgid "Invalid entry at %{error_location}: '%{file_text}'"
1614
1622
  msgstr ""
1615
1623
 
1616
- #: ../lib/puppet/file_serving/configuration/parser.rb:70
1624
+ #: ../lib/puppet/file_serving/configuration/parser.rb:73
1617
1625
  msgid "%{mount} is already mounted at %{name} at %{error_location}"
1618
1626
  msgstr ""
1619
1627
 
1620
- #: ../lib/puppet/file_serving/configuration/parser.rb:95
1628
+ #: ../lib/puppet/file_serving/configuration/parser.rb:98
1621
1629
  msgid "Removing mount \"%{mount}\": %{detail}"
1622
1630
  msgstr ""
1623
1631
 
1624
- #: ../lib/puppet/file_serving/configuration/parser.rb:99
1632
+ #: ../lib/puppet/file_serving/configuration/parser.rb:102
1625
1633
  msgid "The '%{mount}' module can not have a path. Ignoring attempt to set it"
1626
1634
  msgstr ""
1627
1635
 
@@ -2833,8 +2841,8 @@ msgstr ""
2833
2841
  msgid "Option %{option} conflicts with existing option %{conflict} on %{face}"
2834
2842
  msgstr ""
2835
2843
 
2836
- #. TRANSLATORS 'Puppet.settings' should not be translated
2837
2844
  #. TRANSLATORS 'Puppet.settings' references to the Puppet settings options and should not be translated
2845
+ #. TRANSLATORS 'Puppet.settings' should not be translated
2838
2846
  #: ../lib/puppet/interface/action.rb:315 ../lib/puppet/interface/option_manager.rb:14
2839
2847
  msgid "Global option %{option} does not exist in Puppet.settings"
2840
2848
  msgstr ""
@@ -3190,11 +3198,11 @@ msgstr ""
3190
3198
  msgid "Resolving dependencies ..."
3191
3199
  msgstr ""
3192
3200
 
3193
- #: ../lib/puppet/module_tool/applications/installer.rb:162
3201
+ #: ../lib/puppet/module_tool/applications/installer.rb:208
3194
3202
  msgid "Preparing to install ..."
3195
3203
  msgstr ""
3196
3204
 
3197
- #: ../lib/puppet/module_tool/applications/installer.rb:165
3205
+ #: ../lib/puppet/module_tool/applications/installer.rb:211
3198
3206
  msgid "Installing -- do not interrupt ..."
3199
3207
  msgstr ""
3200
3208
 
@@ -3234,7 +3242,7 @@ msgstr ""
3234
3242
  msgid "'%{module_name}' (%{version}) requested; '%{module_name}' (%{installed_version}) already installed"
3235
3243
  msgstr ""
3236
3244
 
3237
- #: ../lib/puppet/module_tool/errors/installer.rb:16 ../lib/puppet/module_tool/errors/installer.rb:54 ../lib/puppet/module_tool/errors/installer.rb:72 ../lib/puppet/module_tool/errors/shared.rb:64 ../lib/puppet/module_tool/errors/shared.rb:106
3245
+ #: ../lib/puppet/module_tool/errors/installer.rb:16 ../lib/puppet/module_tool/errors/installer.rb:54 ../lib/puppet/module_tool/errors/installer.rb:72 ../lib/puppet/module_tool/errors/shared.rb:79 ../lib/puppet/module_tool/errors/shared.rb:121
3238
3246
  msgid "Could not install module '%{module_name}' (%{version})"
3239
3247
  msgstr ""
3240
3248
 
@@ -3264,7 +3272,7 @@ msgstr ""
3264
3272
  msgid "Could not install '%{requested_package}'"
3265
3273
  msgstr ""
3266
3274
 
3267
- #: ../lib/puppet/module_tool/errors/installer.rb:38 ../lib/puppet/module_tool/errors/shared.rb:43
3275
+ #: ../lib/puppet/module_tool/errors/installer.rb:38 ../lib/puppet/module_tool/errors/shared.rb:58
3268
3276
  msgid " No releases are available from %{source}"
3269
3277
  msgstr ""
3270
3278
 
@@ -3309,150 +3317,162 @@ msgstr ""
3309
3317
  msgid " Package attempted to install file into %{path} under %{directory}."
3310
3318
  msgstr ""
3311
3319
 
3312
- #: ../lib/puppet/module_tool/errors/shared.rb:11
3320
+ #: ../lib/puppet/module_tool/errors/shared.rb:12
3313
3321
  msgid "Could not %{action} '%{module_name}' (%{version}); no version satisfies all dependencies"
3314
3322
  msgstr ""
3315
3323
 
3316
- #: ../lib/puppet/module_tool/errors/shared.rb:16 ../lib/puppet/module_tool/errors/shared.rb:171 ../lib/puppet/module_tool/errors/upgrader.rb:58
3324
+ #: ../lib/puppet/module_tool/errors/shared.rb:17 ../lib/puppet/module_tool/errors/shared.rb:186 ../lib/puppet/module_tool/errors/upgrader.rb:58
3317
3325
  msgid "Could not %{action} module '%{module_name}' (%{version})"
3318
3326
  msgstr ""
3319
3327
 
3320
- #: ../lib/puppet/module_tool/errors/shared.rb:17
3321
- msgid " No version of '%{module_name}' can satisfy all dependencies"
3328
+ #: ../lib/puppet/module_tool/errors/shared.rb:20
3329
+ msgid " The requested version cannot satisfy one or more of the following installed modules:"
3330
+ msgstr ""
3331
+
3332
+ #: ../lib/puppet/module_tool/errors/shared.rb:22
3333
+ msgid " %{name}, installed: %{current_version}, expected: %{constraints}"
3334
+ msgstr ""
3335
+
3336
+ #: ../lib/puppet/module_tool/errors/shared.rb:25
3337
+ msgid " %{mod}, expects '%{name}': %{range}"
3338
+ msgstr ""
3339
+
3340
+ #: ../lib/puppet/module_tool/errors/shared.rb:30
3341
+ msgid " The requested version cannot satisfy all dependencies"
3322
3342
  msgstr ""
3323
3343
 
3324
3344
  #. TRANSLATORS `puppet module %{action} --ignore-dependencies` is a command line and should not be translated
3325
- #: ../lib/puppet/module_tool/errors/shared.rb:19
3326
- msgid " Use `puppet module %{action} --ignore-dependencies` to %{action} only this module"
3345
+ #: ../lib/puppet/module_tool/errors/shared.rb:34
3346
+ msgid " Use `puppet module %{action} '%{module_name}' --ignore-dependencies` to %{action} only this module"
3327
3347
  msgstr ""
3328
3348
 
3329
- #: ../lib/puppet/module_tool/errors/shared.rb:33
3349
+ #: ../lib/puppet/module_tool/errors/shared.rb:48
3330
3350
  msgid "Could not %{action} '%{module_name}'; no releases are available from %{source}"
3331
3351
  msgstr ""
3332
3352
 
3333
- #: ../lib/puppet/module_tool/errors/shared.rb:35
3353
+ #: ../lib/puppet/module_tool/errors/shared.rb:50
3334
3354
  msgid "Could not %{action} '%{module_name}'; no releases matching '%{version}' are available from %{source}"
3335
3355
  msgstr ""
3336
3356
 
3337
- #: ../lib/puppet/module_tool/errors/shared.rb:41
3357
+ #: ../lib/puppet/module_tool/errors/shared.rb:56
3338
3358
  msgid "Could not %{action} '%{module_name}' (%{version})"
3339
3359
  msgstr ""
3340
3360
 
3341
- #: ../lib/puppet/module_tool/errors/shared.rb:44
3361
+ #: ../lib/puppet/module_tool/errors/shared.rb:59
3342
3362
  msgid " Does '%{module_name}' have at least one published release?"
3343
3363
  msgstr ""
3344
3364
 
3345
- #: ../lib/puppet/module_tool/errors/shared.rb:46
3365
+ #: ../lib/puppet/module_tool/errors/shared.rb:61
3346
3366
  msgid " No releases matching '%{requested_version}' are available from %{source}"
3347
3367
  msgstr ""
3348
3368
 
3349
- #: ../lib/puppet/module_tool/errors/shared.rb:59
3369
+ #: ../lib/puppet/module_tool/errors/shared.rb:74
3350
3370
  msgid "'%{module_name}' (%{version}) requested; installation conflict"
3351
3371
  msgstr ""
3352
3372
 
3353
- #: ../lib/puppet/module_tool/errors/shared.rb:67
3373
+ #: ../lib/puppet/module_tool/errors/shared.rb:82
3354
3374
  msgid " Dependency '%{name}' (%{version}) would overwrite %{directory}"
3355
3375
  msgstr ""
3356
3376
 
3357
- #: ../lib/puppet/module_tool/errors/shared.rb:69
3377
+ #: ../lib/puppet/module_tool/errors/shared.rb:84
3358
3378
  msgid " Installation would overwrite %{directory}"
3359
3379
  msgstr ""
3360
3380
 
3361
- #: ../lib/puppet/module_tool/errors/shared.rb:73
3381
+ #: ../lib/puppet/module_tool/errors/shared.rb:88
3362
3382
  msgid " Currently, '%{current_name}' (%{current_version}) is installed to that directory"
3363
3383
  msgstr ""
3364
3384
 
3365
3385
  #. TRANSLATORS `puppet module install --ignore-dependencies` is a command line and should not be translated
3366
- #: ../lib/puppet/module_tool/errors/shared.rb:78
3386
+ #: ../lib/puppet/module_tool/errors/shared.rb:93
3367
3387
  msgid " Use `puppet module install --ignore-dependencies` to install only this module"
3368
3388
  msgstr ""
3369
3389
 
3370
3390
  #. TRANSLATORS `puppet module install --force` is a command line and should not be translated
3371
3391
  #. TRANSLATORS `puppet module install --force` is a command line and should not be translated
3372
- #: ../lib/puppet/module_tool/errors/shared.rb:81 ../lib/puppet/module_tool/errors/shared.rb:110
3392
+ #: ../lib/puppet/module_tool/errors/shared.rb:96 ../lib/puppet/module_tool/errors/shared.rb:125
3373
3393
  msgid " Use `puppet module install --force` to install this module anyway"
3374
3394
  msgstr ""
3375
3395
 
3376
- #: ../lib/puppet/module_tool/errors/shared.rb:95
3396
+ #: ../lib/puppet/module_tool/errors/shared.rb:110
3377
3397
  msgid "'%{module_name}' (%{version}) requested; Invalid dependency cycle"
3378
3398
  msgstr ""
3379
3399
 
3380
- #: ../lib/puppet/module_tool/errors/shared.rb:100
3400
+ #: ../lib/puppet/module_tool/errors/shared.rb:115
3381
3401
  msgid "You specified '%{name}' (%{version})"
3382
3402
  msgstr ""
3383
3403
 
3384
3404
  #. TRANSLATORS This message repeats as separate lines as a list under the heading "You specified '%{name}' (%{version})\n"
3385
- #: ../lib/puppet/module_tool/errors/shared.rb:103
3405
+ #: ../lib/puppet/module_tool/errors/shared.rb:118
3386
3406
  msgid "This depends on '%{name}' (%{version})"
3387
3407
  msgstr ""
3388
3408
 
3389
- #: ../lib/puppet/module_tool/errors/shared.rb:107
3409
+ #: ../lib/puppet/module_tool/errors/shared.rb:122
3390
3410
  msgid " No version of '%{module_name}' will satisfy dependencies"
3391
3411
  msgstr ""
3392
3412
 
3393
- #: ../lib/puppet/module_tool/errors/shared.rb:120
3413
+ #: ../lib/puppet/module_tool/errors/shared.rb:135
3394
3414
  msgid "Could not %{action} '%{module_name}'; module is not installed"
3395
3415
  msgstr ""
3396
3416
 
3397
- #: ../lib/puppet/module_tool/errors/shared.rb:125 ../lib/puppet/module_tool/errors/shared.rb:148 ../lib/puppet/module_tool/errors/shared.rb:189
3417
+ #: ../lib/puppet/module_tool/errors/shared.rb:140 ../lib/puppet/module_tool/errors/shared.rb:163 ../lib/puppet/module_tool/errors/shared.rb:204
3398
3418
  msgid "Could not %{action} module '%{module_name}'"
3399
3419
  msgstr ""
3400
3420
 
3401
- #: ../lib/puppet/module_tool/errors/shared.rb:126
3421
+ #: ../lib/puppet/module_tool/errors/shared.rb:141
3402
3422
  msgid " Module '%{module_name}' is not installed"
3403
3423
  msgstr ""
3404
3424
 
3405
3425
  #. TRANSLATORS `puppet module %{action} %{suggestion}` is a command line and should not be translated
3406
- #: ../lib/puppet/module_tool/errors/shared.rb:129
3426
+ #: ../lib/puppet/module_tool/errors/shared.rb:144
3407
3427
  msgid " You may have meant `puppet module %{action} %{suggestion}`"
3408
3428
  msgstr ""
3409
3429
 
3410
3430
  #. TRANSLATORS `puppet module install` is a command line and should not be translated
3411
- #: ../lib/puppet/module_tool/errors/shared.rb:132
3431
+ #: ../lib/puppet/module_tool/errors/shared.rb:147
3412
3432
  msgid " Use `puppet module install` to install this module"
3413
3433
  msgstr ""
3414
3434
 
3415
3435
  #. TRANSLATORS "module path" refers to a set of directories where modules may be installed
3416
- #: ../lib/puppet/module_tool/errors/shared.rb:143
3436
+ #: ../lib/puppet/module_tool/errors/shared.rb:158
3417
3437
  msgid "Could not %{action} '%{module_name}'; module appears in multiple places in the module path"
3418
3438
  msgstr ""
3419
3439
 
3420
- #: ../lib/puppet/module_tool/errors/shared.rb:149
3440
+ #: ../lib/puppet/module_tool/errors/shared.rb:164
3421
3441
  msgid " Module '%{module_name}' appears multiple places in the module path"
3422
3442
  msgstr ""
3423
3443
 
3424
3444
  #. TRANSLATORS This is repeats as separate lines as a list under "Module '%{module_name}' appears multiple places in the module path"
3425
- #: ../lib/puppet/module_tool/errors/shared.rb:152
3445
+ #: ../lib/puppet/module_tool/errors/shared.rb:167
3426
3446
  msgid " '%{module_name}' (%{version}) was found in %{path}"
3427
3447
  msgstr ""
3428
3448
 
3429
3449
  #. TRANSLATORS `--modulepath` is command line option and should not be translated
3430
- #: ../lib/puppet/module_tool/errors/shared.rb:155
3450
+ #: ../lib/puppet/module_tool/errors/shared.rb:170
3431
3451
  msgid " Use the `--modulepath` option to limit the search to specific directories"
3432
3452
  msgstr ""
3433
3453
 
3434
- #: ../lib/puppet/module_tool/errors/shared.rb:166
3454
+ #: ../lib/puppet/module_tool/errors/shared.rb:181
3435
3455
  msgid "Could not %{action} '%{module_name}'; module has had changes made locally"
3436
3456
  msgstr ""
3437
3457
 
3438
- #: ../lib/puppet/module_tool/errors/shared.rb:172
3458
+ #: ../lib/puppet/module_tool/errors/shared.rb:187
3439
3459
  msgid " Installed module has had changes made locally"
3440
3460
  msgstr ""
3441
3461
 
3442
3462
  #. TRANSLATORS `puppet module %{action} --ignore-changes` is a command line and should not be translated
3443
- #: ../lib/puppet/module_tool/errors/shared.rb:174
3463
+ #: ../lib/puppet/module_tool/errors/shared.rb:189
3444
3464
  msgid " Use `puppet module %{action} --ignore-changes` to %{action} this module anyway"
3445
3465
  msgstr ""
3446
3466
 
3447
- #: ../lib/puppet/module_tool/errors/shared.rb:184
3467
+ #: ../lib/puppet/module_tool/errors/shared.rb:199
3448
3468
  msgid "Could not %{action} '%{module_name}'; %{error}"
3449
3469
  msgstr ""
3450
3470
 
3451
- #: ../lib/puppet/module_tool/errors/shared.rb:190
3471
+ #: ../lib/puppet/module_tool/errors/shared.rb:205
3452
3472
  msgid " Failure trying to parse metadata"
3453
3473
  msgstr ""
3454
3474
 
3455
- #: ../lib/puppet/module_tool/errors/shared.rb:191
3475
+ #: ../lib/puppet/module_tool/errors/shared.rb:206
3456
3476
  msgid " Original message was: %{message}"
3457
3477
  msgstr ""
3458
3478
 
@@ -3738,15 +3758,15 @@ msgstr ""
3738
3758
  msgid "Not a valid indirection type"
3739
3759
  msgstr ""
3740
3760
 
3741
- #: ../lib/puppet/network/http/connection.rb:43
3761
+ #: ../lib/puppet/network/http/connection.rb:47
3742
3762
  msgid "Unrecognized option(s): %{opts}"
3743
3763
  msgstr ""
3744
3764
 
3745
- #: ../lib/puppet/network/http/connection.rb:49
3765
+ #: ../lib/puppet/network/http/connection.rb:53
3746
3766
  msgid "Expected an instance of Puppet::SSL::Verifier but was passed a %{klass}"
3747
3767
  msgstr ""
3748
3768
 
3749
- #: ../lib/puppet/network/http/connection.rb:272
3769
+ #: ../lib/puppet/network/http/connection.rb:276
3750
3770
  msgid "Too many HTTP redirections for %{host}:%{port}"
3751
3771
  msgstr ""
3752
3772
 
@@ -3872,54 +3892,54 @@ msgstr ""
3872
3892
 
3873
3893
  #. TRANSLATORS: do not translate the variable names in this error message
3874
3894
  #. TRANSLATORS: do not translate the variable names in this error message
3875
- #: ../lib/puppet/pal/pal_impl.rb:76 ../lib/puppet/pal/pal_impl.rb:174
3895
+ #: ../lib/puppet/pal/pal_impl.rb:76 ../lib/puppet/pal/pal_impl.rb:182
3876
3896
  msgid "manifest_file or code_string cannot be given when configured_by_env is true"
3877
3897
  msgstr ""
3878
3898
 
3879
- #: ../lib/puppet/pal/pal_impl.rb:222
3899
+ #: ../lib/puppet/pal/pal_impl.rb:238
3880
3900
  msgid "temporary environment name"
3881
3901
  msgstr ""
3882
3902
 
3883
3903
  #. TRANSLATORS: do not translate variable name string in these assertions
3884
- #: ../lib/puppet/pal/pal_impl.rb:227
3904
+ #: ../lib/puppet/pal/pal_impl.rb:243
3885
3905
  msgid "A block must be given to 'in_tmp_environment'"
3886
3906
  msgstr ""
3887
3907
 
3888
3908
  #. TRANSLATORS terms in the assertions below are names of terms in code
3889
- #: ../lib/puppet/pal/pal_impl.rb:282
3909
+ #: ../lib/puppet/pal/pal_impl.rb:298
3890
3910
  msgid "A block must be given to 'in_environment'"
3891
3911
  msgstr ""
3892
3912
 
3893
3913
  #. TRANSLATORS 'in_environment' is a name, do not translate
3894
- #: ../lib/puppet/pal/pal_impl.rb:287
3914
+ #: ../lib/puppet/pal/pal_impl.rb:303
3895
3915
  msgid "The environment directory '%{env_dir}' does not exist"
3896
3916
  msgstr ""
3897
3917
 
3898
- #: ../lib/puppet/pal/pal_impl.rb:310
3918
+ #: ../lib/puppet/pal/pal_impl.rb:326
3899
3919
  msgid "No directory found for the environment '%{env_name}' on the path '%{envpath}'"
3900
3920
  msgstr ""
3901
3921
 
3902
- #: ../lib/puppet/pal/pal_impl.rb:364
3922
+ #: ../lib/puppet/pal/pal_impl.rb:380
3903
3923
  msgid "Given variables must be a hash, got %{type}"
3904
3924
  msgstr ""
3905
3925
 
3906
- #: ../lib/puppet/pal/pal_impl.rb:370
3926
+ #: ../lib/puppet/pal/pal_impl.rb:386
3907
3927
  msgid "Given variable '%{varname}' has illegal name"
3908
3928
  msgstr ""
3909
3929
 
3910
- #: ../lib/puppet/pal/pal_impl.rb:374
3930
+ #: ../lib/puppet/pal/pal_impl.rb:390
3911
3931
  msgid "Given value for '%{varname}' has illegal type - got: %{type}"
3912
3932
  msgstr ""
3913
3933
 
3914
- #: ../lib/puppet/pal/pal_impl.rb:511
3934
+ #: ../lib/puppet/pal/pal_impl.rb:564
3915
3935
  msgid "Puppet Pal: %{what}"
3916
3936
  msgstr ""
3917
3937
 
3918
- #: ../lib/puppet/pal/pal_impl.rb:525
3938
+ #: ../lib/puppet/pal/pal_impl.rb:578
3919
3939
  msgid "Cannot use '%{a_term}' and '%{b_term}' at the same time"
3920
3940
  msgstr ""
3921
3941
 
3922
- #: ../lib/puppet/pal/pal_impl.rb:532
3942
+ #: ../lib/puppet/pal/pal_impl.rb:585
3923
3943
  msgid "A block must be given"
3924
3944
  msgstr ""
3925
3945
 
@@ -6326,19 +6346,19 @@ msgstr ""
6326
6346
  msgid "Mac OS X packages must specify a package source"
6327
6347
  msgstr ""
6328
6348
 
6329
- #: ../lib/puppet/provider/package/apt.rb:81
6349
+ #: ../lib/puppet/provider/package/apt.rb:85
6330
6350
  msgid "/etc/apt/sources.list contains a cdrom source; not installing. Use 'allowcdrom' to override this failure."
6331
6351
  msgstr ""
6332
6352
 
6333
- #: ../lib/puppet/provider/package/apt.rb:163 ../lib/puppet/provider/package/fink.rb:55
6353
+ #: ../lib/puppet/provider/package/apt.rb:167 ../lib/puppet/provider/package/fink.rb:55
6334
6354
  msgid "Could not find latest version"
6335
6355
  msgstr ""
6336
6356
 
6337
- #: ../lib/puppet/provider/package/apt.rb:174 ../lib/puppet/provider/package/fink.rb:66
6357
+ #: ../lib/puppet/provider/package/apt.rb:178 ../lib/puppet/provider/package/fink.rb:66
6338
6358
  msgid "Preseeding %{response} to debconf-set-selections"
6339
6359
  msgstr ""
6340
6360
 
6341
- #: ../lib/puppet/provider/package/apt.rb:178 ../lib/puppet/provider/package/fink.rb:70
6361
+ #: ../lib/puppet/provider/package/apt.rb:182 ../lib/puppet/provider/package/fink.rb:70
6342
6362
  msgid "No responsefile specified or non existent, not preseeding anything"
6343
6363
  msgstr ""
6344
6364
 
@@ -7043,69 +7063,69 @@ msgstr ""
7043
7063
  msgid "Not attempting to load %{type} %{fqname} as this object was missing during a prior compilation"
7044
7064
  msgstr ""
7045
7065
 
7046
- #: ../lib/puppet/settings.rb:101
7066
+ #: ../lib/puppet/settings.rb:102
7047
7067
  msgid "New environment loaders generated from the requested section."
7048
7068
  msgstr ""
7049
7069
 
7050
- #: ../lib/puppet/settings.rb:303
7070
+ #: ../lib/puppet/settings.rb:304
7051
7071
  msgid "Attempting to initialize global default settings more than once!"
7052
7072
  msgstr ""
7053
7073
 
7054
- #: ../lib/puppet/settings.rb:516
7074
+ #: ../lib/puppet/settings.rb:504
7055
7075
  msgid "Using --configprint is deprecated. Use 'puppet config <subcommand>' instead."
7056
7076
  msgstr ""
7057
7077
 
7058
- #: ../lib/puppet/settings.rb:658
7078
+ #: ../lib/puppet/settings.rb:646
7059
7079
  msgid "Could not load %{file}: %{detail}"
7060
7080
  msgstr ""
7061
7081
 
7062
- #: ../lib/puppet/settings.rb:766
7082
+ #: ../lib/puppet/settings.rb:755
7063
7083
  msgid "Invalid setting type '%{type}'"
7064
7084
  msgstr ""
7065
7085
 
7066
- #: ../lib/puppet/settings.rb:921
7086
+ #: ../lib/puppet/settings.rb:910
7067
7087
  msgid "Unknown searchpath case: %{source_type} for the %{source} settings path element."
7068
7088
  msgstr ""
7069
7089
 
7070
- #: ../lib/puppet/settings.rb:994
7090
+ #: ../lib/puppet/settings.rb:983
7071
7091
  msgid "setting definition for '%{name}' is not a hash!"
7072
7092
  msgstr ""
7073
7093
 
7074
- #: ../lib/puppet/settings.rb:999
7094
+ #: ../lib/puppet/settings.rb:988
7075
7095
  msgid "Setting %{name} is already defined"
7076
7096
  msgstr ""
7077
7097
 
7078
- #: ../lib/puppet/settings.rb:1005
7098
+ #: ../lib/puppet/settings.rb:994
7079
7099
  msgid "Setting %{name} is already using short name '%{short}'"
7080
7100
  msgstr ""
7081
7101
 
7082
- #: ../lib/puppet/settings.rb:1276
7102
+ #: ../lib/puppet/settings.rb:1265
7083
7103
  msgid "Setting %{name} is deprecated."
7084
7104
  msgstr ""
7085
7105
 
7086
7106
  #. TRANSLATORS 'puppet.conf' is a file name and should not be translated
7087
- #: ../lib/puppet/settings.rb:1281
7107
+ #: ../lib/puppet/settings.rb:1270
7088
7108
  msgid "Setting %{name} is deprecated in puppet.conf."
7089
7109
  msgstr ""
7090
7110
 
7091
- #: ../lib/puppet/settings.rb:1452
7111
+ #: ../lib/puppet/settings.rb:1457
7092
7112
  msgid "Error converting value for param '%{name}': %{detail}"
7093
7113
  msgstr ""
7094
7114
 
7095
- #: ../lib/puppet/settings.rb:1476
7115
+ #: ../lib/puppet/settings.rb:1481
7096
7116
  msgid "Could not find value for %{expression}"
7097
7117
  msgstr ""
7098
7118
 
7099
7119
  #. TRANSLATORS '$environment' is a Puppet specific variable and should not be translated
7100
- #: ../lib/puppet/settings.rb:1486
7120
+ #: ../lib/puppet/settings.rb:1491
7101
7121
  msgid "You cannot interpolate $environment within '%{setting_name}' when using directory environments."
7102
7122
  msgstr ""
7103
7123
 
7104
- #: ../lib/puppet/settings.rb:1487
7124
+ #: ../lib/puppet/settings.rb:1492
7105
7125
  msgid "Its value will remain %{value}."
7106
7126
  msgstr ""
7107
7127
 
7108
- #: ../lib/puppet/settings.rb:1518
7128
+ #: ../lib/puppet/settings.rb:1523
7109
7129
  msgid "Attempt to assign a value to unknown setting %{name}"
7110
7130
  msgstr ""
7111
7131
 
@@ -8426,7 +8446,7 @@ msgstr ""
8426
8446
  msgid "Could not autoload %{name}: %{detail}"
8427
8447
  msgstr ""
8428
8448
 
8429
- #: ../lib/puppet/util/autoload.rb:184
8449
+ #: ../lib/puppet/util/autoload.rb:177
8430
8450
  msgid "Autoload paths cannot be fully qualified"
8431
8451
  msgstr ""
8432
8452
 
@@ -8979,19 +8999,19 @@ msgstr ""
8979
8999
  msgid "Unable to write the file %{file_path}. %{error}"
8980
9000
  msgstr ""
8981
9001
 
8982
- #: ../lib/puppet/util/posix.rb:22
9002
+ #: ../lib/puppet/util/posix.rb:29
8983
9003
  msgid "Removing any duplicate group entries"
8984
9004
  msgstr ""
8985
9005
 
8986
- #: ../lib/puppet/util/posix.rb:35
9006
+ #: ../lib/puppet/util/posix.rb:75
8987
9007
  msgid "Did not get id from caller"
8988
9008
  msgstr ""
8989
9009
 
8990
- #: ../lib/puppet/util/posix.rb:39 ../lib/puppet/util/posix.rb:64
9010
+ #: ../lib/puppet/util/posix.rb:79 ../lib/puppet/util/posix.rb:104
8991
9011
  msgid "Tried to get %{field} field for silly id %{id}"
8992
9012
  msgstr ""
8993
9013
 
8994
- #: ../lib/puppet/util/posix.rb:92 ../lib/puppet/util/posix.rb:102 ../lib/puppet/util/posix.rb:112
9014
+ #: ../lib/puppet/util/posix.rb:132 ../lib/puppet/util/posix.rb:142 ../lib/puppet/util/posix.rb:152
8995
9015
  msgid "Can only handle users and groups"
8996
9016
  msgstr ""
8997
9017