puppet 5.5.2-universal-darwin → 5.5.3-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 (83) hide show
  1. checksums.yaml +4 -4
  2. data/lib/puppet/application/device.rb +43 -30
  3. data/lib/puppet/defaults.rb +7 -4
  4. data/lib/puppet/environments.rb +2 -3
  5. data/lib/puppet/face/config.rb +1 -1
  6. data/lib/puppet/face/module/build.rb +5 -0
  7. data/lib/puppet/gettext/config.rb +28 -5
  8. data/lib/puppet/indirector/catalog/compiler.rb +5 -7
  9. data/lib/puppet/node/environment.rb +5 -1
  10. data/lib/puppet/provider/selmodule/semodule.rb +1 -1
  11. data/lib/puppet/provider/service/upstart.rb +2 -0
  12. data/lib/puppet/reference/configuration.rb +6 -0
  13. data/lib/puppet/resource/status.rb +2 -0
  14. data/lib/puppet/resource/type_collection.rb +1 -1
  15. data/lib/puppet/settings.rb +6 -0
  16. data/lib/puppet/ssl/certificate_request.rb +11 -3
  17. data/lib/puppet/transaction/event_manager.rb +3 -1
  18. data/lib/puppet/transaction/report.rb +1 -1
  19. data/lib/puppet/util.rb +2 -0
  20. data/lib/puppet/util/command_line.rb +0 -1
  21. data/lib/puppet/util/log/destinations.rb +1 -1
  22. data/lib/puppet/util/windows/file.rb +18 -0
  23. data/lib/puppet/util/windows/security.rb +26 -14
  24. data/lib/puppet/version.rb +1 -1
  25. data/locales/puppet.pot +96 -79
  26. data/man/man5/puppet.conf.5 +8 -5
  27. data/man/man8/puppet-agent.8 +1 -1
  28. data/man/man8/puppet-apply.8 +1 -1
  29. data/man/man8/puppet-ca.8 +2 -2
  30. data/man/man8/puppet-catalog.8 +1 -1
  31. data/man/man8/puppet-cert.8 +1 -1
  32. data/man/man8/puppet-certificate.8 +2 -2
  33. data/man/man8/puppet-certificate_request.8 +1 -1
  34. data/man/man8/puppet-certificate_revocation_list.8 +1 -1
  35. data/man/man8/puppet-config.8 +2 -2
  36. data/man/man8/puppet-describe.8 +1 -1
  37. data/man/man8/puppet-device.8 +6 -2
  38. data/man/man8/puppet-doc.8 +1 -1
  39. data/man/man8/puppet-epp.8 +1 -1
  40. data/man/man8/puppet-facts.8 +1 -1
  41. data/man/man8/puppet-filebucket.8 +1 -1
  42. data/man/man8/puppet-generate.8 +1 -1
  43. data/man/man8/puppet-help.8 +1 -1
  44. data/man/man8/puppet-key.8 +1 -1
  45. data/man/man8/puppet-lookup.8 +1 -1
  46. data/man/man8/puppet-man.8 +1 -1
  47. data/man/man8/puppet-master.8 +1 -1
  48. data/man/man8/puppet-module.8 +1 -1
  49. data/man/man8/puppet-node.8 +1 -1
  50. data/man/man8/puppet-parser.8 +1 -1
  51. data/man/man8/puppet-plugin.8 +1 -1
  52. data/man/man8/puppet-report.8 +1 -1
  53. data/man/man8/puppet-resource.8 +1 -1
  54. data/man/man8/puppet-script.8 +1 -1
  55. data/man/man8/puppet-status.8 +1 -1
  56. data/man/man8/puppet.8 +2 -2
  57. data/spec/integration/type/file_spec.rb +3 -1
  58. data/spec/integration/util/windows/security_spec.rb +14 -1
  59. data/spec/shared_examples/rhel_package_provider.rb +2 -2
  60. data/spec/unit/application/device_spec.rb +55 -11
  61. data/spec/unit/application/master_spec.rb +5 -4
  62. data/spec/unit/gettext/config_spec.rb +29 -10
  63. data/spec/unit/node/environment_spec.rb +4 -3
  64. data/spec/unit/provider/package/aptitude_spec.rb +1 -1
  65. data/spec/unit/provider/package/aptrpm_spec.rb +1 -1
  66. data/spec/unit/provider/package/dpkg_spec.rb +1 -1
  67. data/spec/unit/provider/package/nim_spec.rb +2 -11
  68. data/spec/unit/provider/package/opkg_spec.rb +2 -2
  69. data/spec/unit/provider/package/pkg_spec.rb +52 -17
  70. data/spec/unit/provider/package/rpm_spec.rb +30 -10
  71. data/spec/unit/provider/package/urpmi_spec.rb +9 -3
  72. data/spec/unit/provider/selmodule_spec.rb +6 -0
  73. data/spec/unit/provider/service/openrc_spec.rb +1 -1
  74. data/spec/unit/resource/status_spec.rb +2 -0
  75. data/spec/unit/resource/type_collection_spec.rb +4 -1
  76. data/spec/unit/ssl/certificate_request_spec.rb +11 -0
  77. data/spec/unit/transaction/event_manager_spec.rb +12 -0
  78. data/spec/unit/util/diff_spec.rb +11 -3
  79. data/spec/unit/util/execution_spec.rb +2 -1
  80. data/spec/unit/util/filetype_spec.rb +6 -2
  81. data/spec/unit/util/log/destinations_spec.rb +28 -12
  82. data/spec/unit/util/plist_spec.rb +12 -6
  83. metadata +2 -2
@@ -151,9 +151,11 @@ class Puppet::Transaction::EventManager
151
151
  end
152
152
  return true
153
153
  rescue => detail
154
- resource.err _("Failed to call %{callback}: %{detail}") % { callback: callback, detail: detail }
154
+ resource_error_message = _("Failed to call %{callback}: %{detail}") % { callback: callback, detail: detail }
155
+ resource.err resource_error_message
155
156
 
156
157
  transaction.resource_status(resource).failed_to_restart = true
158
+ transaction.resource_status(resource).fail_with_event(resource_error_message)
157
159
  resource.log_exception(detail)
158
160
  return false
159
161
  end
@@ -224,7 +224,7 @@ class Puppet::Transaction::Report
224
224
  @external_times ||= {}
225
225
  @host = Puppet[:node_name_value]
226
226
  @time = Time.now
227
- @report_format = 9
227
+ @report_format = 10
228
228
  @puppet_version = Puppet.version
229
229
  @configuration_version = configuration_version
230
230
  @transaction_uuid = transaction_uuid
data/lib/puppet/util.rb CHANGED
@@ -300,6 +300,8 @@ module Util
300
300
  # would use Puppet.features.microsoft_windows?, but this method needs to
301
301
  # be called during the initialization of features so it can't depend on
302
302
  # that.
303
+ #
304
+ # @deprecated Use ruby's built-in methods to determine if a path is absolute.
303
305
  platform ||= Puppet::Util::Platform.windows? ? :windows : :posix
304
306
  regex = case platform
305
307
  when :windows
@@ -123,7 +123,6 @@ module Puppet
123
123
  $LOAD_PATH << dir unless $LOAD_PATH.include?(dir)
124
124
  end
125
125
 
126
- Puppet::GettextConfig.reset_text_domain('cli')
127
126
  Puppet::ModuleTranslations.load_from_modulepath(configured_environment.modules)
128
127
  Puppet::ModuleTranslations.load_from_vardir(Puppet[:vardir])
129
128
 
@@ -109,7 +109,7 @@ Puppet::Util::Log.newdesttype :file do
109
109
  def handle(msg)
110
110
  if @json > 0
111
111
  @json > 1 ? @file.puts(',') : @json = 2
112
- Puppet::Util::Json.dump(msg.to_structured_hash, @file)
112
+ @file.puts(Puppet::Util::Json.dump(msg.to_structured_hash))
113
113
  else
114
114
  @file.puts("#{msg.time} #{msg.source} (#{msg.level}): #{msg}")
115
115
  end
@@ -7,11 +7,29 @@ module Puppet::Util::Windows::File
7
7
 
8
8
  FILE_ATTRIBUTE_READONLY = 0x00000001
9
9
 
10
+ # https://msdn.microsoft.com/en-us/library/windows/desktop/aa379607(v=vs.85).aspx
11
+ # The right to use the object for synchronization. This enables a thread to
12
+ # wait until the object is in the signaled state. Some object types do not
13
+ # support this access right.
10
14
  SYNCHRONIZE = 0x100000
15
+ # The right to delete the object.
16
+ DELETE = 0x00010000
17
+ # The right to read the information in the object's security descriptor, not including the information in the system access control list (SACL).
18
+ # READ_CONTROL = 0x00020000
19
+ # The right to modify the discretionary access control list (DACL) in the object's security descriptor.
20
+ WRITE_DAC = 0x00040000
21
+ # The right to change the owner in the object's security descriptor.
22
+ WRITE_OWNER = 0x00080000
23
+
24
+ # Combines DELETE, READ_CONTROL, WRITE_DAC, and WRITE_OWNER access.
11
25
  STANDARD_RIGHTS_REQUIRED = 0xf0000
26
+ # Currently defined to equal READ_CONTROL.
12
27
  STANDARD_RIGHTS_READ = 0x20000
28
+ # Currently defined to equal READ_CONTROL.
13
29
  STANDARD_RIGHTS_WRITE = 0x20000
30
+ # Currently defined to equal READ_CONTROL.
14
31
  STANDARD_RIGHTS_EXECUTE = 0x20000
32
+ # Combines DELETE, READ_CONTROL, WRITE_DAC, WRITE_OWNER, and SYNCHRONIZE access.
15
33
  STANDARD_RIGHTS_ALL = 0x1F0000
16
34
  SPECIFIC_RIGHTS_ALL = 0xFFFF
17
35
 
@@ -283,6 +283,8 @@ module Puppet::Util::Windows::Security
283
283
  owner_allow = FILE::STANDARD_RIGHTS_ALL |
284
284
  FILE::FILE_READ_ATTRIBUTES |
285
285
  FILE::FILE_WRITE_ATTRIBUTES
286
+ # this prevents a mode that is not 7 from taking ownership of a file based
287
+ # on group membership and rewriting it / making it executable
286
288
  group_allow = FILE::STANDARD_RIGHTS_READ |
287
289
  FILE::FILE_READ_ATTRIBUTES |
288
290
  FILE::SYNCHRONIZE
@@ -304,6 +306,15 @@ module Puppet::Util::Windows::Security
304
306
  end
305
307
  end
306
308
 
309
+ # With a mode value of '7' for group / other, the value must then include
310
+ # additional perms beyond STANDARD_RIGHTS_READ to allow DACL modification
311
+ if ((mode & S_IRWXG) == S_IRWXG)
312
+ group_allow |= FILE::DELETE | FILE::WRITE_DAC | FILE::WRITE_OWNER
313
+ end
314
+ if ((mode & S_IRWXO) == S_IRWXO)
315
+ other_allow |= FILE::DELETE | FILE::WRITE_DAC | FILE::WRITE_OWNER
316
+ end
317
+
307
318
  if (mode & S_ISVTX).nonzero?
308
319
  nobody_allow |= FILE::FILE_APPEND_DATA;
309
320
  end
@@ -315,18 +326,16 @@ module Puppet::Util::Windows::Security
315
326
  system_allow = FILE::FILE_ALL_ACCESS
316
327
  end
317
328
 
318
- isdir = File.directory?(path)
319
-
320
- if isdir
321
- if (mode & (S_IWUSR | S_IXUSR)) == (S_IWUSR | S_IXUSR)
322
- owner_allow |= FILE::FILE_DELETE_CHILD
323
- end
324
- if (mode & (S_IWGRP | S_IXGRP)) == (S_IWGRP | S_IXGRP) && (mode & S_ISVTX) == 0
325
- group_allow |= FILE::FILE_DELETE_CHILD
326
- end
327
- if (mode & (S_IWOTH | S_IXOTH)) == (S_IWOTH | S_IXOTH) && (mode & S_ISVTX) == 0
328
- other_allow |= FILE::FILE_DELETE_CHILD
329
- end
329
+ # even though FILE_DELETE_CHILD only applies to directories, it can be set on files
330
+ # this is necessary to do to ensure a file ends up with (F) FullControl
331
+ if (mode & (S_IWUSR | S_IXUSR)) == (S_IWUSR | S_IXUSR)
332
+ owner_allow |= FILE::FILE_DELETE_CHILD
333
+ end
334
+ if (mode & (S_IWGRP | S_IXGRP)) == (S_IWGRP | S_IXGRP) && (mode & S_ISVTX) == 0
335
+ group_allow |= FILE::FILE_DELETE_CHILD
336
+ end
337
+ if (mode & (S_IWOTH | S_IXOTH)) == (S_IWOTH | S_IXOTH) && (mode & S_ISVTX) == 0
338
+ other_allow |= FILE::FILE_DELETE_CHILD
330
339
  end
331
340
 
332
341
  # if owner and group the same, then map group permissions to the one owner ACE
@@ -341,6 +350,7 @@ module Puppet::Util::Windows::Security
341
350
  FILE.remove_attributes(path, FILE::FILE_ATTRIBUTE_READONLY)
342
351
  end
343
352
 
353
+ isdir = File.directory?(path)
344
354
  dacl = Puppet::Util::Windows::AccessControlList.new
345
355
  dacl.allow(sd.owner, owner_allow)
346
356
  unless isownergroup
@@ -363,8 +373,10 @@ module Puppet::Util::Windows::Security
363
373
  dacl.allow(Puppet::Util::Windows::SID::CreatorGroup, group_allow, inherit)
364
374
 
365
375
  inherit = inherit_only | Puppet::Util::Windows::AccessControlEntry::OBJECT_INHERIT_ACE
366
- dacl.allow(Puppet::Util::Windows::SID::CreatorOwner, owner_allow & ~FILE::FILE_EXECUTE, inherit)
367
- dacl.allow(Puppet::Util::Windows::SID::CreatorGroup, group_allow & ~FILE::FILE_EXECUTE, inherit)
376
+ # allow any previously set bits *except* for these
377
+ perms_to_strip = ~(FILE::FILE_EXECUTE + FILE::WRITE_OWNER + FILE::WRITE_DAC)
378
+ dacl.allow(Puppet::Util::Windows::SID::CreatorOwner, owner_allow & perms_to_strip, inherit)
379
+ dacl.allow(Puppet::Util::Windows::SID::CreatorGroup, group_allow & perms_to_strip, inherit)
368
380
  end
369
381
 
370
382
  new_sd = Puppet::Util::Windows::SecurityDescriptor.new(sd.owner, sd.group, dacl, protected)
@@ -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 = '5.5.2'
9
+ PUPPETVERSION = '5.5.3'
10
10
 
11
11
  ##
12
12
  # version is a public API method intended to always provide a fast and
data/locales/puppet.pot CHANGED
@@ -6,11 +6,11 @@
6
6
  #, fuzzy
7
7
  msgid ""
8
8
  msgstr ""
9
- "Project-Id-Version: Puppet automation framework 5.5.1-46-g2800397\n"
9
+ "Project-Id-Version: Puppet automation framework 5.5.2-62-gde0743a\n"
10
10
  "\n"
11
11
  "Report-Msgid-Bugs-To: https://tickets.puppetlabs.com\n"
12
- "POT-Creation-Date: 2018-05-18 20:31+0000\n"
13
- "PO-Revision-Date: 2018-05-18 20:31+0000\n"
12
+ "POT-Creation-Date: 2018-07-03 21:45+0000\n"
13
+ "PO-Revision-Date: 2018-07-03 21:45+0000\n"
14
14
  "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
15
15
  "Language-Team: LANGUAGE <LL@li.org>\n"
16
16
  "Language: \n"
@@ -245,43 +245,51 @@ msgstr ""
245
245
  msgid "Display help about resource types"
246
246
  msgstr ""
247
247
 
248
- #: ../lib/puppet/application/device.rb:75
248
+ #: ../lib/puppet/application/device.rb:77
249
249
  msgid "Manage remote network devices"
250
250
  msgstr ""
251
251
 
252
- #: ../lib/puppet/application/device.rb:211
252
+ #: ../lib/puppet/application/device.rb:216
253
253
  msgid "resource command requires target"
254
254
  msgstr ""
255
255
 
256
- #: ../lib/puppet/application/device.rb:216
256
+ #: ../lib/puppet/application/device.rb:219
257
+ msgid "facts command requires target"
258
+ msgstr ""
259
+
260
+ #: ../lib/puppet/application/device.rb:222
257
261
  msgid "missing argument: --target is required when using --apply"
258
262
  msgstr ""
259
263
 
260
- #: ../lib/puppet/application/device.rb:220
264
+ #: ../lib/puppet/application/device.rb:223
261
265
  msgid "%{file} does not exist, cannot apply"
262
266
  msgstr ""
263
267
 
264
- #: ../lib/puppet/application/device.rb:238
268
+ #: ../lib/puppet/application/device.rb:239
265
269
  msgid "Target device / certificate '%{target}' not found in %{config}"
266
270
  msgstr ""
267
271
 
268
- #: ../lib/puppet/application/device.rb:240
272
+ #: ../lib/puppet/application/device.rb:241
269
273
  msgid "No device found in %{config}"
270
274
  msgstr ""
271
275
 
272
- #: ../lib/puppet/application/device.rb:262
276
+ #: ../lib/puppet/application/device.rb:263
273
277
  msgid "retrieving resource: %{resource} from %{target} at %{scheme}%{url_host}%{port}%{url_path}"
274
278
  msgstr ""
275
279
 
276
- #: ../lib/puppet/application/device.rb:294
280
+ #: ../lib/puppet/application/device.rb:278
281
+ msgid "retrieving facts from %{target} at %{scheme}%{url_host}%{port}%{url_path}"
282
+ msgstr ""
283
+
284
+ #: ../lib/puppet/application/device.rb:303
277
285
  msgid "starting applying configuration to %{target} at %{scheme}%{url_host}%{port}%{url_path}"
278
286
  msgstr ""
279
287
 
280
- #: ../lib/puppet/application/device.rb:331 ../lib/puppet/application/resource.rb:196
288
+ #: ../lib/puppet/application/device.rb:340 ../lib/puppet/application/resource.rb:196
281
289
  msgid "You must specify the type to display"
282
290
  msgstr ""
283
291
 
284
- #: ../lib/puppet/application/device.rb:332 ../lib/puppet/application/resource.rb:197
292
+ #: ../lib/puppet/application/device.rb:341 ../lib/puppet/application/resource.rb:197
285
293
  msgid "Could not find type %{type}"
286
294
  msgstr ""
287
295
 
@@ -656,20 +664,20 @@ msgstr ""
656
664
  msgid "Certificate names must be lower case"
657
665
  msgstr ""
658
666
 
659
- #: ../lib/puppet/defaults.rb:967 ../lib/puppet/settings/enum_setting.rb:13 ../lib/puppet/settings/symbolic_enum_setting.rb:14
667
+ #: ../lib/puppet/defaults.rb:968 ../lib/puppet/settings/enum_setting.rb:13 ../lib/puppet/settings/symbolic_enum_setting.rb:14
660
668
  msgid "Invalid value '%{value}' for parameter %{name}. Allowed values are '%{allowed_values}'"
661
669
  msgstr ""
662
670
 
663
- #: ../lib/puppet/defaults.rb:1493 ../lib/puppet/defaults.rb:1508
671
+ #: ../lib/puppet/defaults.rb:1500 ../lib/puppet/defaults.rb:1515
664
672
  msgid "Attempted to set both server and server_list."
665
673
  msgstr ""
666
674
 
667
- #: ../lib/puppet/defaults.rb:1494 ../lib/puppet/defaults.rb:1509
675
+ #: ../lib/puppet/defaults.rb:1501 ../lib/puppet/defaults.rb:1516
668
676
  msgid "Server setting will not be used."
669
677
  msgstr ""
670
678
 
671
679
  #. TRANSLATORS 'pluginsync' is a setting and should not be translated
672
- #: ../lib/puppet/defaults.rb:1819
680
+ #: ../lib/puppet/defaults.rb:1826
673
681
  msgid "Setting 'pluginsync' is deprecated."
674
682
  msgstr ""
675
683
 
@@ -1295,7 +1303,12 @@ msgstr ""
1295
1303
  msgid "Unable to find metadata.json in module root %{module_path} or parent directories. See <https://puppet.com/docs/puppet/latest/modules_publishing.html> for required file format."
1296
1304
  msgstr ""
1297
1305
 
1298
- #: ../lib/puppet/face/module/build.rb:61
1306
+ #. TRANSLATORS 'puppet module build' is the name of the puppet command and 'Puppet Development Kit' is the name of the software package replacing this action and should not be translated.
1307
+ #: ../lib/puppet/face/module/build.rb:56
1308
+ msgid "`puppet module build` is deprecated and will be removed in a future release. This action has been replaced by Puppet Development Kit. For more information visit https://puppet.com/docs/pdk/latest/pdk.html."
1309
+ msgstr ""
1310
+
1311
+ #: ../lib/puppet/face/module/build.rb:64
1299
1312
  msgid "Module built: %{path}"
1300
1313
  msgstr ""
1301
1314
 
@@ -2355,116 +2368,116 @@ msgstr ""
2355
2368
  msgid "Catalog for %{request} was requested with fact definition for the wrong node (%{fact_name})."
2356
2369
  msgstr ""
2357
2370
 
2358
- #: ../lib/puppet/indirector/catalog/compiler.rb:70
2371
+ #: ../lib/puppet/indirector/catalog/compiler.rb:68
2359
2372
  msgid "Setup server facts for compiling"
2360
2373
  msgstr ""
2361
2374
 
2362
- #: ../lib/puppet/indirector/catalog/compiler.rb:94
2375
+ #: ../lib/puppet/indirector/catalog/compiler.rb:92
2363
2376
  msgid "Unsupported facts format"
2364
2377
  msgstr ""
2365
2378
 
2366
2379
  #. TRANSLATORS Inlining refers to adding additional metadata (in this case we are not inlining)
2367
- #: ../lib/puppet/indirector/catalog/compiler.rb:135
2380
+ #: ../lib/puppet/indirector/catalog/compiler.rb:133
2368
2381
  msgid "Not inlining absent resource"
2369
2382
  msgstr ""
2370
2383
 
2371
2384
  #. TRANSLATORS Inlining refers to adding additional metadata (in this case we are not inlining)
2372
- #: ../lib/puppet/indirector/catalog/compiler.rb:138
2385
+ #: ../lib/puppet/indirector/catalog/compiler.rb:136
2373
2386
  msgid "Not inlining resource without sources"
2374
2387
  msgstr ""
2375
2388
 
2376
2389
  #. TRANSLATORS Inlining refers to adding additional metadata (in this case we are not inlining)
2377
- #: ../lib/puppet/indirector/catalog/compiler.rb:141
2390
+ #: ../lib/puppet/indirector/catalog/compiler.rb:139
2378
2391
  msgid "Not inlining unsupported source scheme"
2379
2392
  msgstr ""
2380
2393
 
2381
2394
  #. TRANSLATORS Inlining refers to adding additional metadata (in this case we are not inlining)
2382
- #: ../lib/puppet/indirector/catalog/compiler.rb:163
2395
+ #: ../lib/puppet/indirector/catalog/compiler.rb:161
2383
2396
  msgid "Not inlining file outside environment"
2384
2397
  msgstr ""
2385
2398
 
2386
2399
  #. TRANSLATORS Inlining refers to adding additional metadata
2387
- #: ../lib/puppet/indirector/catalog/compiler.rb:169
2400
+ #: ../lib/puppet/indirector/catalog/compiler.rb:167
2388
2401
  msgid "Inlining file metadata"
2389
2402
  msgstr ""
2390
2403
 
2391
- #: ../lib/puppet/indirector/catalog/compiler.rb:255
2404
+ #: ../lib/puppet/indirector/catalog/compiler.rb:253
2392
2405
  msgid "Could not get metadata for %{resource}"
2393
2406
  msgstr ""
2394
2407
 
2395
- #: ../lib/puppet/indirector/catalog/compiler.rb:276
2408
+ #: ../lib/puppet/indirector/catalog/compiler.rb:274
2396
2409
  msgid "Unable to find a common checksum type between agent '%{agent_type}' and master '%{master_type}'."
2397
2410
  msgstr ""
2398
2411
 
2399
- #: ../lib/puppet/indirector/catalog/compiler.rb:283
2412
+ #: ../lib/puppet/indirector/catalog/compiler.rb:281
2400
2413
  msgid "Compiled static catalog for %{node} in environment %{environment} in %%{seconds} seconds"
2401
2414
  msgstr ""
2402
2415
 
2403
- #: ../lib/puppet/indirector/catalog/compiler.rb:284
2416
+ #: ../lib/puppet/indirector/catalog/compiler.rb:282
2404
2417
  msgid "Compiled static catalog for %{node} in environment %{environment}"
2405
2418
  msgstr ""
2406
2419
 
2407
- #: ../lib/puppet/indirector/catalog/compiler.rb:286
2420
+ #: ../lib/puppet/indirector/catalog/compiler.rb:284
2408
2421
  msgid "Compiled static catalog for %{node} in %%{seconds} seconds"
2409
2422
  msgstr ""
2410
2423
 
2411
- #: ../lib/puppet/indirector/catalog/compiler.rb:287
2424
+ #: ../lib/puppet/indirector/catalog/compiler.rb:285
2412
2425
  msgid "Compiled static catalog for %{node}"
2413
2426
  msgstr ""
2414
2427
 
2415
- #: ../lib/puppet/indirector/catalog/compiler.rb:292
2428
+ #: ../lib/puppet/indirector/catalog/compiler.rb:290
2416
2429
  msgid "Compiled catalog for %{node} in environment %{environment} in %%{seconds} seconds"
2417
2430
  msgstr ""
2418
2431
 
2419
- #: ../lib/puppet/indirector/catalog/compiler.rb:293
2432
+ #: ../lib/puppet/indirector/catalog/compiler.rb:291
2420
2433
  msgid "Compiled catalog for %{node} in environment %{environment}"
2421
2434
  msgstr ""
2422
2435
 
2423
- #: ../lib/puppet/indirector/catalog/compiler.rb:295
2436
+ #: ../lib/puppet/indirector/catalog/compiler.rb:293
2424
2437
  msgid "Compiled catalog for %{node} in %%{seconds} seconds"
2425
2438
  msgstr ""
2426
2439
 
2427
- #: ../lib/puppet/indirector/catalog/compiler.rb:296
2440
+ #: ../lib/puppet/indirector/catalog/compiler.rb:294
2428
2441
  msgid "Compiled catalog for %{node}"
2429
2442
  msgstr ""
2430
2443
 
2431
2444
  #. TRANSLATORS Inlined refers to adding additional metadata
2432
- #: ../lib/puppet/indirector/catalog/compiler.rb:318
2445
+ #: ../lib/puppet/indirector/catalog/compiler.rb:316
2433
2446
  msgid "Inlined resource metadata into static catalog for %{node} in environment %{environment} in %%{seconds} seconds"
2434
2447
  msgstr ""
2435
2448
 
2436
2449
  #. TRANSLATORS Inlined refers to adding additional metadata
2437
- #: ../lib/puppet/indirector/catalog/compiler.rb:320
2450
+ #: ../lib/puppet/indirector/catalog/compiler.rb:318
2438
2451
  msgid "Inlined resource metadata into static catalog for %{node} in environment %{environment}"
2439
2452
  msgstr ""
2440
2453
 
2441
2454
  #. TRANSLATORS Inlined refers to adding additional metadata
2442
- #: ../lib/puppet/indirector/catalog/compiler.rb:323
2455
+ #: ../lib/puppet/indirector/catalog/compiler.rb:321
2443
2456
  msgid "Inlined resource metadata into static catalog for %{node} in %%{seconds} seconds"
2444
2457
  msgstr ""
2445
2458
 
2446
2459
  #. TRANSLATORS Inlined refers to adding additional metadata
2447
- #: ../lib/puppet/indirector/catalog/compiler.rb:325
2460
+ #: ../lib/puppet/indirector/catalog/compiler.rb:323
2448
2461
  msgid "Inlined resource metadata into static catalog for %{node}"
2449
2462
  msgstr ""
2450
2463
 
2451
- #: ../lib/puppet/indirector/catalog/compiler.rb:342
2464
+ #: ../lib/puppet/indirector/catalog/compiler.rb:340
2452
2465
  msgid "Found node information"
2453
2466
  msgstr ""
2454
2467
 
2455
- #: ../lib/puppet/indirector/catalog/compiler.rb:350
2468
+ #: ../lib/puppet/indirector/catalog/compiler.rb:348
2456
2469
  msgid "Failed when searching for node %{name}: %{detail}"
2457
2470
  msgstr ""
2458
2471
 
2459
- #: ../lib/puppet/indirector/catalog/compiler.rb:369
2472
+ #: ../lib/puppet/indirector/catalog/compiler.rb:367
2460
2473
  msgid "Invalid option use_node for a remote request"
2461
2474
  msgstr ""
2462
2475
 
2463
- #: ../lib/puppet/indirector/catalog/compiler.rb:387
2476
+ #: ../lib/puppet/indirector/catalog/compiler.rb:385
2464
2477
  msgid "Could not find node '%{name}'; cannot compile"
2465
2478
  msgstr ""
2466
2479
 
2467
- #: ../lib/puppet/indirector/catalog/compiler.rb:405
2480
+ #: ../lib/puppet/indirector/catalog/compiler.rb:403
2468
2481
  msgid "Could not retrieve fact %{fact}"
2469
2482
  msgstr ""
2470
2483
 
@@ -4199,7 +4212,7 @@ msgstr ""
4199
4212
  msgid "The 'disable_per_environment_manifest' setting is true, and the '%{env_name}' environment has an environment.conf manifest that conflicts with the 'default_manifest' setting."
4200
4213
  msgstr ""
4201
4214
 
4202
- #: ../lib/puppet/node/environment.rb:564 ../lib/puppet/pops/loaders.rb:298
4215
+ #: ../lib/puppet/node/environment.rb:568 ../lib/puppet/pops/loaders.rb:298
4203
4216
  msgid "Could not parse for environment %{env}: %{detail}"
4204
4217
  msgstr ""
4205
4218
 
@@ -7583,53 +7596,57 @@ msgstr ""
7583
7596
  msgid "Attempting to initialize global default settings more than once!"
7584
7597
  msgstr ""
7585
7598
 
7586
- #: ../lib/puppet/settings.rb:689
7599
+ #: ../lib/puppet/settings.rb:457
7600
+ msgid "Using --configprint is deprecated. Use 'puppet config <subcommand>' instead."
7601
+ msgstr ""
7602
+
7603
+ #: ../lib/puppet/settings.rb:695
7587
7604
  msgid "Invalid setting type '%{type}'"
7588
7605
  msgstr ""
7589
7606
 
7590
- #: ../lib/puppet/settings.rb:833
7607
+ #: ../lib/puppet/settings.rb:839
7591
7608
  msgid "Unknown searchpath case: %{source_type} for the %{source} settings path element."
7592
7609
  msgstr ""
7593
7610
 
7594
- #: ../lib/puppet/settings.rb:895
7611
+ #: ../lib/puppet/settings.rb:901
7595
7612
  msgid "setting definition for '%{name}' is not a hash!"
7596
7613
  msgstr ""
7597
7614
 
7598
- #: ../lib/puppet/settings.rb:900
7615
+ #: ../lib/puppet/settings.rb:906
7599
7616
  msgid "Setting %{name} is already defined"
7600
7617
  msgstr ""
7601
7618
 
7602
- #: ../lib/puppet/settings.rb:904
7619
+ #: ../lib/puppet/settings.rb:910
7603
7620
  msgid "Setting %{name} is already using short name '%{short}'"
7604
7621
  msgstr ""
7605
7622
 
7606
- #: ../lib/puppet/settings.rb:1161
7623
+ #: ../lib/puppet/settings.rb:1167
7607
7624
  msgid "Setting %{name} is deprecated."
7608
7625
  msgstr ""
7609
7626
 
7610
7627
  #. TRANSLATORS 'puppet.conf' is a file name and should not be translated
7611
- #: ../lib/puppet/settings.rb:1166
7628
+ #: ../lib/puppet/settings.rb:1172
7612
7629
  msgid "Setting %{name} is deprecated in puppet.conf."
7613
7630
  msgstr ""
7614
7631
 
7615
- #: ../lib/puppet/settings.rb:1333
7632
+ #: ../lib/puppet/settings.rb:1339
7616
7633
  msgid "Error converting value for param '%{name}': %{detail}"
7617
7634
  msgstr ""
7618
7635
 
7619
- #: ../lib/puppet/settings.rb:1357
7636
+ #: ../lib/puppet/settings.rb:1363
7620
7637
  msgid "Could not find value for %{expression}"
7621
7638
  msgstr ""
7622
7639
 
7623
7640
  #. TRANSLATORS '$environment' is a Puppet specific variable and should not be translated
7624
- #: ../lib/puppet/settings.rb:1367
7641
+ #: ../lib/puppet/settings.rb:1373
7625
7642
  msgid "You cannot interpolate $environment within '%{setting_name}' when using directory environments."
7626
7643
  msgstr ""
7627
7644
 
7628
- #: ../lib/puppet/settings.rb:1368
7645
+ #: ../lib/puppet/settings.rb:1374
7629
7646
  msgid "Its value will remain %{value}."
7630
7647
  msgstr ""
7631
7648
 
7632
- #: ../lib/puppet/settings.rb:1399
7649
+ #: ../lib/puppet/settings.rb:1405
7633
7650
  msgid "Attempt to assign a value to unknown setting %{name}"
7634
7651
  msgstr ""
7635
7652
 
@@ -7969,23 +7986,23 @@ msgstr ""
7969
7986
  msgid "Cannot create CSR with extension request %{oid}: %{message}"
7970
7987
  msgstr ""
7971
7988
 
7972
- #: ../lib/puppet/ssl/certificate_request.rb:302
7989
+ #: ../lib/puppet/ssl/certificate_request.rb:310
7973
7990
  msgid "In %{attr}, expected Set but found %{klass}"
7974
7991
  msgstr ""
7975
7992
 
7976
- #: ../lib/puppet/ssl/certificate_request.rb:306
7993
+ #: ../lib/puppet/ssl/certificate_request.rb:314
7977
7994
  msgid "In %{attr}, expected Set[Array] but found %{klass}"
7978
7995
  msgstr ""
7979
7996
 
7980
- #: ../lib/puppet/ssl/certificate_request.rb:310
7997
+ #: ../lib/puppet/ssl/certificate_request.rb:318
7981
7998
  msgid "In %{attr}, expected Set[Array] with one value but found %{count} elements"
7982
7999
  msgstr ""
7983
8000
 
7984
- #: ../lib/puppet/ssl/certificate_request.rb:314
8001
+ #: ../lib/puppet/ssl/certificate_request.rb:322
7985
8002
  msgid "In %{attr}, expected Set[Array[Sequence[...]]], but found %{klass}"
7986
8003
  msgstr ""
7987
8004
 
7988
- #: ../lib/puppet/ssl/certificate_request.rb:318
8005
+ #: ../lib/puppet/ssl/certificate_request.rb:326
7989
8006
  msgid "In %{attr}, expected Set[Array[Sequence[Array[...]]]], but found %{klass}"
7990
8007
  msgstr ""
7991
8008
 
@@ -8233,7 +8250,7 @@ msgstr[1] ""
8233
8250
  msgid "Failed to call %{callback}: %{detail}"
8234
8251
  msgstr ""
8235
8252
 
8236
- #: ../lib/puppet/transaction/event_manager.rb:162
8253
+ #: ../lib/puppet/transaction/event_manager.rb:164
8237
8254
  msgid "Would have triggered '%{callback}' from %{count} event"
8238
8255
  msgid_plural "Would have triggered '%{callback}' from %{count} events"
8239
8256
  msgstr[0] ""
@@ -9125,15 +9142,15 @@ msgstr ""
9125
9142
  msgid "Could not initialize global default settings"
9126
9143
  msgstr ""
9127
9144
 
9128
- #: ../lib/puppet/util/command_line.rb:167
9145
+ #: ../lib/puppet/util/command_line.rb:166
9129
9146
  msgid "Error: Could not parse application options: invalid option: %{opt}"
9130
9147
  msgstr ""
9131
9148
 
9132
- #: ../lib/puppet/util/command_line.rb:170
9149
+ #: ../lib/puppet/util/command_line.rb:169
9133
9150
  msgid "See 'puppet help' for help on available puppet subcommands"
9134
9151
  msgstr ""
9135
9152
 
9136
- #: ../lib/puppet/util/command_line.rb:183
9153
+ #: ../lib/puppet/util/command_line.rb:182
9137
9154
  msgid "Error: Unknown Puppet subcommand '%{cmd}'"
9138
9155
  msgstr ""
9139
9156
 
@@ -9939,15 +9956,15 @@ msgstr ""
9939
9956
  msgid "(Win32 error: %{detail})"
9940
9957
  msgstr ""
9941
9958
 
9942
- #: ../lib/puppet/util/windows/file.rb:162
9959
+ #: ../lib/puppet/util/windows/file.rb:180
9943
9960
  msgid "Failed to set file attributes"
9944
9961
  msgstr ""
9945
9962
 
9946
- #: ../lib/puppet/util/windows/file.rb:237
9963
+ #: ../lib/puppet/util/windows/file.rb:255
9947
9964
  msgid "out_buffer is required"
9948
9965
  msgstr ""
9949
9966
 
9950
- #: ../lib/puppet/util/windows/file.rb:324
9967
+ #: ../lib/puppet/util/windows/file.rb:342
9951
9968
  msgid "Failed to call GetLongPathName"
9952
9969
  msgstr ""
9953
9970
 
@@ -10040,43 +10057,43 @@ msgstr ""
10040
10057
  msgid "Failed to get volume information"
10041
10058
  msgstr ""
10042
10059
 
10043
- #: ../lib/puppet/util/windows/security.rb:383 ../lib/puppet/util/windows/security.rb:400 ../lib/puppet/util/windows/sid.rb:154 ../lib/puppet/util/windows/sid.rb:216 ../lib/puppet/util/windows/user.rb:45
10060
+ #: ../lib/puppet/util/windows/security.rb:395 ../lib/puppet/util/windows/security.rb:412 ../lib/puppet/util/windows/sid.rb:154 ../lib/puppet/util/windows/sid.rb:216 ../lib/puppet/util/windows/user.rb:45
10044
10061
  msgid "Invalid SID"
10045
10062
  msgstr ""
10046
10063
 
10047
- #: ../lib/puppet/util/windows/security.rb:387 ../lib/puppet/util/windows/security.rb:404
10064
+ #: ../lib/puppet/util/windows/security.rb:399 ../lib/puppet/util/windows/security.rb:416
10048
10065
  msgid "Failed to add access control entry"
10049
10066
  msgstr ""
10050
10067
 
10051
- #: ../lib/puppet/util/windows/security.rb:415 ../lib/puppet/util/windows/security.rb:597
10068
+ #: ../lib/puppet/util/windows/security.rb:427 ../lib/puppet/util/windows/security.rb:609
10052
10069
  msgid "Invalid DACL"
10053
10070
  msgstr ""
10054
10071
 
10055
- #: ../lib/puppet/util/windows/security.rb:438
10072
+ #: ../lib/puppet/util/windows/security.rb:450
10056
10073
  msgid "Unsupported access control entry type: 0x%{type}"
10057
10074
  msgstr ""
10058
10075
 
10059
- #: ../lib/puppet/util/windows/security.rb:472
10076
+ #: ../lib/puppet/util/windows/security.rb:484
10060
10077
  msgid "Failed to open '%{path}'"
10061
10078
  msgstr ""
10062
10079
 
10063
- #: ../lib/puppet/util/windows/security.rb:519
10080
+ #: ../lib/puppet/util/windows/security.rb:531
10064
10081
  msgid "Failed to adjust process privileges"
10065
10082
  msgstr ""
10066
10083
 
10067
- #: ../lib/puppet/util/windows/security.rb:549
10084
+ #: ../lib/puppet/util/windows/security.rb:561
10068
10085
  msgid "Failed to get security information"
10069
10086
  msgstr ""
10070
10087
 
10071
- #: ../lib/puppet/util/windows/security.rb:560
10088
+ #: ../lib/puppet/util/windows/security.rb:572
10072
10089
  msgid "Failed to get security descriptor control"
10073
10090
  msgstr ""
10074
10091
 
10075
- #: ../lib/puppet/util/windows/security.rb:593
10092
+ #: ../lib/puppet/util/windows/security.rb:605
10076
10093
  msgid "Failed to initialize ACL"
10077
10094
  msgstr ""
10078
10095
 
10079
- #: ../lib/puppet/util/windows/security.rb:632
10096
+ #: ../lib/puppet/util/windows/security.rb:644
10080
10097
  msgid "Failed to set security information"
10081
10098
  msgstr ""
10082
10099