puppet 7.1.0 → 7.3.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 (118) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile.lock +15 -13
  3. data/lib/puppet/application.rb +10 -6
  4. data/lib/puppet/application/agent.rb +1 -0
  5. data/lib/puppet/application/apply.rb +3 -2
  6. data/lib/puppet/application/device.rb +1 -0
  7. data/lib/puppet/application/script.rb +1 -0
  8. data/lib/puppet/configurer.rb +16 -3
  9. data/lib/puppet/defaults.rb +5 -14
  10. data/lib/puppet/face/facts.rb +15 -1
  11. data/lib/puppet/file_serving/configuration/parser.rb +5 -2
  12. data/lib/puppet/module_tool/applications/installer.rb +48 -2
  13. data/lib/puppet/module_tool/errors/shared.rb +17 -2
  14. data/lib/puppet/network/formats.rb +67 -0
  15. data/lib/puppet/parser/ast/leaf.rb +3 -2
  16. data/lib/puppet/pops/evaluator/deferred_resolver.rb +5 -3
  17. data/lib/puppet/pops/model/ast_transformer.rb +1 -1
  18. data/lib/puppet/provider/package/apt.rb +4 -0
  19. data/lib/puppet/reference/configuration.rb +6 -5
  20. data/lib/puppet/settings.rb +33 -28
  21. data/lib/puppet/settings/alias_setting.rb +37 -0
  22. data/lib/puppet/util/autoload.rb +1 -8
  23. data/lib/puppet/util/posix.rb +1 -1
  24. data/lib/puppet/version.rb +1 -1
  25. data/locales/puppet.pot +157 -141
  26. data/man/man5/puppet.conf.5 +6 -6
  27. data/man/man8/puppet-agent.8 +2 -2
  28. data/man/man8/puppet-apply.8 +2 -2
  29. data/man/man8/puppet-catalog.8 +1 -1
  30. data/man/man8/puppet-config.8 +1 -1
  31. data/man/man8/puppet-describe.8 +1 -1
  32. data/man/man8/puppet-device.8 +2 -2
  33. data/man/man8/puppet-doc.8 +1 -1
  34. data/man/man8/puppet-epp.8 +1 -1
  35. data/man/man8/puppet-facts.8 +5 -2
  36. data/man/man8/puppet-filebucket.8 +1 -1
  37. data/man/man8/puppet-generate.8 +1 -1
  38. data/man/man8/puppet-help.8 +1 -1
  39. data/man/man8/puppet-lookup.8 +1 -1
  40. data/man/man8/puppet-module.8 +1 -1
  41. data/man/man8/puppet-node.8 +1 -1
  42. data/man/man8/puppet-parser.8 +1 -1
  43. data/man/man8/puppet-plugin.8 +1 -1
  44. data/man/man8/puppet-report.8 +1 -1
  45. data/man/man8/puppet-resource.8 +1 -1
  46. data/man/man8/puppet-script.8 +2 -2
  47. data/man/man8/puppet-ssl.8 +1 -1
  48. data/man/man8/puppet.8 +2 -2
  49. data/spec/fixtures/integration/application/agent/cached_deferred_catalog.json +91 -0
  50. data/spec/integration/application/agent_spec.rb +127 -3
  51. data/spec/integration/application/apply_spec.rb +19 -0
  52. data/spec/integration/defaults_spec.rb +0 -7
  53. data/spec/integration/indirector/file_content/file_server_spec.rb +0 -2
  54. data/spec/integration/indirector/file_metadata/file_server_spec.rb +0 -2
  55. data/spec/integration/resource/type_collection_spec.rb +2 -6
  56. data/spec/integration/transaction_spec.rb +4 -9
  57. data/spec/integration/util/windows/adsi_spec.rb +3 -1
  58. data/spec/integration/util/windows/registry_spec.rb +0 -10
  59. data/spec/spec_helper.rb +1 -4
  60. data/spec/unit/agent_spec.rb +8 -6
  61. data/spec/unit/application/agent_spec.rb +0 -1
  62. data/spec/unit/application/filebucket_spec.rb +0 -2
  63. data/spec/unit/application_spec.rb +17 -9
  64. data/spec/unit/confine/feature_spec.rb +1 -1
  65. data/spec/unit/confine_spec.rb +8 -2
  66. data/spec/unit/face/node_spec.rb +0 -11
  67. data/spec/unit/file_serving/configuration/parser_spec.rb +8 -1
  68. data/spec/unit/file_serving/metadata_spec.rb +3 -3
  69. data/spec/unit/file_serving/terminus_helper_spec.rb +11 -4
  70. data/spec/unit/forge/module_release_spec.rb +2 -7
  71. data/spec/unit/indirector/face_spec.rb +0 -1
  72. data/spec/unit/indirector/facts/facter_spec.rb +11 -5
  73. data/spec/unit/indirector/file_bucket_file/selector_spec.rb +26 -8
  74. data/spec/unit/indirector/indirection_spec.rb +8 -12
  75. data/spec/unit/indirector_spec.rb +2 -2
  76. data/spec/unit/module_tool/applications/installer_spec.rb +66 -0
  77. data/spec/unit/network/formats_spec.rb +41 -0
  78. data/spec/unit/network/http/api/indirected_routes_spec.rb +0 -4
  79. data/spec/unit/parser/compiler_spec.rb +3 -19
  80. data/spec/unit/parser/resource_spec.rb +14 -8
  81. data/spec/unit/pops/evaluator/deferred_resolver_spec.rb +20 -0
  82. data/spec/unit/property_spec.rb +1 -0
  83. data/spec/unit/provider/nameservice_spec.rb +66 -65
  84. data/spec/unit/provider/package/apt_spec.rb +4 -8
  85. data/spec/unit/provider/package/base_spec.rb +6 -5
  86. data/spec/unit/provider/package/pacman_spec.rb +18 -12
  87. data/spec/unit/provider/package/pip_spec.rb +6 -11
  88. data/spec/unit/provider/package/pkgdmg_spec.rb +0 -4
  89. data/spec/unit/provider/user/hpux_spec.rb +1 -1
  90. data/spec/unit/provider_spec.rb +6 -8
  91. data/spec/unit/resource/type_spec.rb +1 -1
  92. data/spec/unit/resource_spec.rb +11 -10
  93. data/spec/unit/settings_spec.rb +13 -6
  94. data/spec/unit/ssl/base_spec.rb +0 -1
  95. data/spec/unit/ssl/ssl_provider_spec.rb +5 -2
  96. data/spec/unit/transaction/additional_resource_generator_spec.rb +3 -7
  97. data/spec/unit/transaction/event_manager_spec.rb +14 -11
  98. data/spec/unit/transaction_spec.rb +13 -4
  99. data/spec/unit/type/file/content_spec.rb +0 -1
  100. data/spec/unit/type/file/selinux_spec.rb +0 -2
  101. data/spec/unit/type/file_spec.rb +0 -6
  102. data/spec/unit/type/group_spec.rb +13 -6
  103. data/spec/unit/type/resources_spec.rb +7 -7
  104. data/spec/unit/type/service_spec.rb +1 -1
  105. data/spec/unit/type/tidy_spec.rb +0 -1
  106. data/spec/unit/type_spec.rb +2 -2
  107. data/spec/unit/util/at_fork_spec.rb +2 -2
  108. data/spec/unit/util/autoload_spec.rb +5 -1
  109. data/spec/unit/util/backups_spec.rb +1 -2
  110. data/spec/unit/util/execution_spec.rb +15 -11
  111. data/spec/unit/util/inifile_spec.rb +6 -14
  112. data/spec/unit/util/log_spec.rb +8 -7
  113. data/spec/unit/util/logging_spec.rb +3 -3
  114. data/spec/unit/util/posix_spec.rb +16 -10
  115. data/spec/unit/util/selinux_spec.rb +76 -52
  116. data/spec/unit/util/suidmanager_spec.rb +44 -41
  117. data/spec/unit/util_spec.rb +13 -6
  118. metadata +7 -2
@@ -50,8 +50,9 @@ class Puppet::Parser::AST::HostName < Puppet::Parser::AST::Leaf
50
50
  end
51
51
 
52
52
  class Puppet::Parser::AST::Regex < Puppet::Parser::AST::Leaf
53
- def initialize(hash)
54
- super(**hash)
53
+ def initialize(value: nil, file: nil, line: nil, pos: nil)
54
+ super(value: value, file: file, line: line, pos: pos)
55
+
55
56
  # transform value from hash options unless it is already a regular expression
56
57
  @value = Regexp.new(@value) unless @value.is_a?(Regexp)
57
58
  end
@@ -16,10 +16,12 @@ class DeferredResolver
16
16
  #
17
17
  # @param facts [Puppet::Node::Facts] the facts object for the node
18
18
  # @param catalog [Puppet::Resource::Catalog] the catalog where all deferred values should be replaced
19
+ # @param environment [Puppet::Node::Environment] the environment whose anonymous module methods
20
+ # are to be mixed into the scope
19
21
  # @return [nil] does not return anything - the catalog is modified as a side effect
20
22
  #
21
- def self.resolve_and_replace(facts, catalog)
22
- compiler = Puppet::Parser::ScriptCompiler.new(catalog.environment_instance, catalog.name, true)
23
+ def self.resolve_and_replace(facts, catalog, environment = catalog.environment_instance)
24
+ compiler = Puppet::Parser::ScriptCompiler.new(environment, catalog.name, true)
23
25
  resolver = new(compiler)
24
26
  resolver.set_facts_variable(facts)
25
27
  # TODO:
@@ -108,7 +110,7 @@ class DeferredResolver
108
110
  # If any of the arguments to a future is a future it needs to be resolved first
109
111
  func_name = f.name
110
112
  mapped_arguments = map_arguments(f.arguments)
111
- # if name starts with $ then this is a call to dig
113
+ # if name starts with $ then this is a call to dig
112
114
  if func_name[0] == DOLLAR
113
115
  var_name = func_name[1..-1]
114
116
  func_name = DIG
@@ -31,7 +31,7 @@ class Puppet::Pops::Model::AstTransformer
31
31
  def ast(o, klass, hash={})
32
32
  # create and pass hash with file and line information
33
33
  # PUP-3274 - still needed since hostname transformation requires AST::HostName, and AST::Regexp
34
- klass.new(merge_location(hash, o))
34
+ klass.new(**merge_location(hash, o))
35
35
  end
36
36
 
37
37
  # THIS IS AN EXPENSIVE OPERATION
@@ -51,6 +51,10 @@ Puppet::Type.type(:package).provide :apt, :parent => :dpkg, :source => :dpkg do
51
51
  @property_flush = {}
52
52
  end
53
53
 
54
+ def mark
55
+ @property_flush[:mark]
56
+ end
57
+
54
58
  def mark=(value)
55
59
  @property_flush[:mark] = value
56
60
  end
@@ -57,11 +57,12 @@ config.header = <<EOT
57
57
  * Each of these settings can be specified in `puppet.conf` or on the
58
58
  command line.
59
59
  * Puppet Enterprise (PE) and open source Puppet share the configuration settings
60
- that are documented here. However, PE defaults for some settings differ from
61
- the open source Puppet defaults. Some examples of settings that have different
62
- PE defaults include `disable18n`, `environment_timeout`, `always_retry_plugins`,
63
- and the Puppet Server JRuby `max-active-instances` setting. To verify PE
64
- configuration defaults, check the `puppet.conf` file after installation.
60
+ documented here. However, PE defaults differ from open source defaults for some
61
+ settings, such as `node_terminus`, `storeconfigs`, `always_retry_plugins`,
62
+ `disable18n`, `environment_timeout` (when Code Manager is enabled), and the
63
+ Puppet Server JRuby `max-active-instances` setting. To verify PE configuration
64
+ defaults, check the `puppet.conf` or `pe-puppet-server.conf` file after
65
+ installation.
65
66
  * When using boolean settings on the command line, use `--setting` and
66
67
  `--no-setting` instead of `--setting (true|false)`. (Using `--setting false`
67
68
  results in "Error: Could not parse application options: needless argument".)
@@ -34,6 +34,7 @@ class Puppet::Settings
34
34
  require 'puppet/settings/server_list_setting'
35
35
  require 'puppet/settings/http_extra_headers_setting'
36
36
  require 'puppet/settings/certificate_revocation_setting'
37
+ require 'puppet/settings/alias_setting'
37
38
 
38
39
  # local reference for convenience
39
40
  PuppetOptionParser = Puppet::Util::CommandLine::PuppetOptionParser
@@ -388,19 +389,6 @@ class Puppet::Settings
388
389
  call_hooks_deferred_to_application_initialization
389
390
  issue_deprecations
390
391
 
391
- run_mode = Puppet::Util::RunMode[self.preferred_run_mode]
392
- if run_mode.agent? || run_mode.server?
393
- if self.set_in_section?(:masterport, run_mode.name) && !self.set_in_section?(:serverport, run_mode.name)
394
- self[:serverport] = self[:masterport]
395
- elsif self.set_by_config?(:masterport) && !self.set_by_config?(:serverport)
396
- self[:serverport] = self[:masterport]
397
- elsif self.set_in_section?(:serverport, run_mode.name) && !self.set_in_section?(:masterport, run_mode.name)
398
- self[:masterport] = self[:serverport]
399
- elsif self.set_by_config?(:serverport) && !self.set_by_config?(:masterport)
400
- self[:masterport] = self[:serverport]
401
- end
402
- end
403
-
404
392
  REQUIRED_APP_SETTINGS.each do |key|
405
393
  create_ancestors(Puppet[key])
406
394
  end
@@ -747,7 +735,8 @@ class Puppet::Settings
747
735
  :autosign => AutosignSetting,
748
736
  :server_list => ServerListSetting,
749
737
  :http_extra_headers => HttpExtraHeadersSetting,
750
- :certificate_revocation => CertificateRevocationSetting
738
+ :certificate_revocation => CertificateRevocationSetting,
739
+ :alias => AliasSetting
751
740
  }
752
741
 
753
742
  # Create a new setting. The value is passed in because it's used to determine
@@ -1285,27 +1274,37 @@ Generated on #{Time.now}.
1285
1274
  end
1286
1275
 
1287
1276
  def add_environment_resources(catalog, sections)
1288
- path = self[:environmentpath]
1289
- envdir = path.split(File::PATH_SEPARATOR).first if path
1290
1277
  configured_environment = self[:environment]
1291
- if configured_environment == "production" && envdir && Puppet::FileSystem.exist?(envdir)
1292
- configured_environment_path = File.join(envdir, configured_environment)
1293
- # If configured_environment_path is a symlink, assume the source path is being managed
1294
- # elsewhere, so don't do any of this configuration
1295
- if !Puppet::FileSystem.symlink?(configured_environment_path)
1278
+
1279
+ if configured_environment == "production" && !production_environment_exists?
1280
+ environment_path = self[:environmentpath]
1281
+ first_environment_path = environment_path.split(File::PATH_SEPARATOR).first
1282
+
1283
+ if Puppet::FileSystem.exist?(first_environment_path)
1284
+ production_environment_path = File.join(first_environment_path, configured_environment)
1296
1285
  parameters = { :ensure => 'directory' }
1297
- unless Puppet::FileSystem.exist?(configured_environment_path)
1298
- parameters[:mode] = '0750'
1299
- if Puppet.features.root?
1300
- parameters[:owner] = Puppet[:user] if service_user_available?
1301
- parameters[:group] = Puppet[:group] if service_group_available?
1302
- end
1286
+ parameters[:mode] = '0750'
1287
+ if Puppet.features.root?
1288
+ parameters[:owner] = Puppet[:user] if service_user_available?
1289
+ parameters[:group] = Puppet[:group] if service_group_available?
1303
1290
  end
1304
- catalog.add_resource(Puppet::Resource.new(:file, configured_environment_path, :parameters => parameters))
1291
+ catalog.add_resource(Puppet::Resource.new(:file, production_environment_path, :parameters => parameters))
1305
1292
  end
1306
1293
  end
1307
1294
  end
1308
1295
 
1296
+ def production_environment_exists?
1297
+ environment_path = self[:environmentpath]
1298
+ paths = environment_path.split(File::PATH_SEPARATOR)
1299
+
1300
+ paths.any? do |path|
1301
+ # If expected_path is a symlink, assume the source path is being managed
1302
+ # elsewhere, so accept it also as a valid production environment path
1303
+ expected_path = File.join(path, 'production')
1304
+ Puppet::FileSystem.directory?(expected_path) || Puppet::FileSystem.symlink?(expected_path)
1305
+ end
1306
+ end
1307
+
1309
1308
  def add_user_resources(catalog, sections)
1310
1309
  return unless Puppet.features.root?
1311
1310
  return if Puppet::Util::Platform.windows?
@@ -1406,6 +1405,12 @@ Generated on #{Time.now}.
1406
1405
  end
1407
1406
  end
1408
1407
 
1408
+ setting = @defaults[name]
1409
+ if setting.respond_to?(:alias_name)
1410
+ val = lookup(setting.alias_name)
1411
+ return val if val
1412
+ end
1413
+
1409
1414
  @defaults[name].default
1410
1415
  end
1411
1416
 
@@ -0,0 +1,37 @@
1
+ class Puppet::Settings::AliasSetting
2
+ attr_reader :name, :alias_name
3
+
4
+ def initialize(args = {})
5
+ @name = args[:name]
6
+ @alias_name = args[:alias_for]
7
+ @alias_for = Puppet.settings.setting(alias_name)
8
+ end
9
+
10
+ def optparse_args
11
+ args = @alias_for.optparse_args
12
+ args[0].gsub!(alias_name.to_s, name.to_s)
13
+ args
14
+ end
15
+
16
+ def getopt_args
17
+ args = @alias_for.getopt_args
18
+ args[0].gsub!(alias_name.to_s, name.to_s)
19
+ args
20
+ end
21
+
22
+ def type
23
+ :alias
24
+ end
25
+
26
+ def method_missing(method, *args)
27
+ begin
28
+ alias_for.send(method, *args)
29
+ rescue => e
30
+ Puppet.log_exception(self.class, e.message)
31
+ end
32
+ end
33
+
34
+ private
35
+
36
+ attr_reader :alias_for
37
+ end
@@ -166,14 +166,7 @@ class Puppet::Util::Autoload
166
166
  # Normalize a path. This converts ALT_SEPARATOR to SEPARATOR on Windows
167
167
  # and eliminates unnecessary parts of a path.
168
168
  def cleanpath(path)
169
- # There are two cases here because cleanpath does not handle absolute
170
- # paths correctly on windows (c:\ and c:/ are treated as distinct) but
171
- # we don't want to convert relative paths to absolute
172
- if Puppet::Util.absolute_path?(path)
173
- File.expand_path(path)
174
- else
175
- Pathname.new(path).cleanpath.to_s
176
- end
169
+ Pathname.new(path).cleanpath.to_s
177
170
  end
178
171
  end
179
172
 
@@ -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'))
@@ -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.3.0'
10
10
 
11
11
  ##
12
12
  # version is a public API method intended to always provide a fast and
@@ -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.1.0-89-g309d69a162\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-13 14:37+0000\n"
13
+ "PO-Revision-Date: 2021-01-13 14:37+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:424
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:453 ../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:457 ../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:468 ../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:477
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:496
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:504
612
612
  msgid "Failed to submit facts: %{detail}"
613
613
  msgstr ""
614
614
 
615
- #: ../lib/puppet/configurer.rb:516
615
+ #: ../lib/puppet/configurer.rb:519
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:537
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:558
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,10 @@ 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
+
1062
1066
  #: ../lib/puppet/face/generate.rb:9
1063
1067
  msgid "Generates Puppet code from Ruby definitions."
1064
1068
  msgstr ""
@@ -1358,19 +1362,19 @@ msgstr ""
1358
1362
  msgid "At least one node should be passed"
1359
1363
  msgstr ""
1360
1364
 
1361
- #: ../lib/puppet/face/node/clean.rb:64
1365
+ #: ../lib/puppet/face/node/clean.rb:72
1362
1366
  msgid "Not managing %{node} certs as this host is not a CA"
1363
1367
  msgstr ""
1364
1368
 
1365
- #: ../lib/puppet/face/node/clean.rb:71
1369
+ #: ../lib/puppet/face/node/clean.rb:79
1366
1370
  msgid "%{node}'s facts removed"
1367
1371
  msgstr ""
1368
1372
 
1369
- #: ../lib/puppet/face/node/clean.rb:77
1373
+ #: ../lib/puppet/face/node/clean.rb:85
1370
1374
  msgid "%{node}'s cached node removed"
1371
1375
  msgstr ""
1372
1376
 
1373
- #: ../lib/puppet/face/node/clean.rb:83
1377
+ #: ../lib/puppet/face/node/clean.rb:91
1374
1378
  msgid "%{node}'s reports removed"
1375
1379
  msgstr ""
1376
1380
 
@@ -2833,8 +2837,8 @@ msgstr ""
2833
2837
  msgid "Option %{option} conflicts with existing option %{conflict} on %{face}"
2834
2838
  msgstr ""
2835
2839
 
2836
- #. TRANSLATORS 'Puppet.settings' should not be translated
2837
2840
  #. TRANSLATORS 'Puppet.settings' references to the Puppet settings options and should not be translated
2841
+ #. TRANSLATORS 'Puppet.settings' should not be translated
2838
2842
  #: ../lib/puppet/interface/action.rb:315 ../lib/puppet/interface/option_manager.rb:14
2839
2843
  msgid "Global option %{option} does not exist in Puppet.settings"
2840
2844
  msgstr ""
@@ -3190,11 +3194,11 @@ msgstr ""
3190
3194
  msgid "Resolving dependencies ..."
3191
3195
  msgstr ""
3192
3196
 
3193
- #: ../lib/puppet/module_tool/applications/installer.rb:162
3197
+ #: ../lib/puppet/module_tool/applications/installer.rb:208
3194
3198
  msgid "Preparing to install ..."
3195
3199
  msgstr ""
3196
3200
 
3197
- #: ../lib/puppet/module_tool/applications/installer.rb:165
3201
+ #: ../lib/puppet/module_tool/applications/installer.rb:211
3198
3202
  msgid "Installing -- do not interrupt ..."
3199
3203
  msgstr ""
3200
3204
 
@@ -3234,7 +3238,7 @@ msgstr ""
3234
3238
  msgid "'%{module_name}' (%{version}) requested; '%{module_name}' (%{installed_version}) already installed"
3235
3239
  msgstr ""
3236
3240
 
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
3241
+ #: ../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
3242
  msgid "Could not install module '%{module_name}' (%{version})"
3239
3243
  msgstr ""
3240
3244
 
@@ -3264,7 +3268,7 @@ msgstr ""
3264
3268
  msgid "Could not install '%{requested_package}'"
3265
3269
  msgstr ""
3266
3270
 
3267
- #: ../lib/puppet/module_tool/errors/installer.rb:38 ../lib/puppet/module_tool/errors/shared.rb:43
3271
+ #: ../lib/puppet/module_tool/errors/installer.rb:38 ../lib/puppet/module_tool/errors/shared.rb:58
3268
3272
  msgid " No releases are available from %{source}"
3269
3273
  msgstr ""
3270
3274
 
@@ -3309,150 +3313,162 @@ msgstr ""
3309
3313
  msgid " Package attempted to install file into %{path} under %{directory}."
3310
3314
  msgstr ""
3311
3315
 
3312
- #: ../lib/puppet/module_tool/errors/shared.rb:11
3316
+ #: ../lib/puppet/module_tool/errors/shared.rb:12
3313
3317
  msgid "Could not %{action} '%{module_name}' (%{version}); no version satisfies all dependencies"
3314
3318
  msgstr ""
3315
3319
 
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
3320
+ #: ../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
3321
  msgid "Could not %{action} module '%{module_name}' (%{version})"
3318
3322
  msgstr ""
3319
3323
 
3320
- #: ../lib/puppet/module_tool/errors/shared.rb:17
3321
- msgid " No version of '%{module_name}' can satisfy all dependencies"
3324
+ #: ../lib/puppet/module_tool/errors/shared.rb:20
3325
+ msgid " The requested version cannot satisfy one or more of the following installed modules:"
3326
+ msgstr ""
3327
+
3328
+ #: ../lib/puppet/module_tool/errors/shared.rb:22
3329
+ msgid " %{name}, installed: %{current_version}, expected: %{constraints}"
3330
+ msgstr ""
3331
+
3332
+ #: ../lib/puppet/module_tool/errors/shared.rb:25
3333
+ msgid " %{mod}, expects '%{name}': %{range}"
3334
+ msgstr ""
3335
+
3336
+ #: ../lib/puppet/module_tool/errors/shared.rb:30
3337
+ msgid " The requested version cannot satisfy all dependencies"
3322
3338
  msgstr ""
3323
3339
 
3324
3340
  #. 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"
3341
+ #: ../lib/puppet/module_tool/errors/shared.rb:34
3342
+ msgid " Use `puppet module %{action} '%{module_name}' --ignore-dependencies` to %{action} only this module"
3327
3343
  msgstr ""
3328
3344
 
3329
- #: ../lib/puppet/module_tool/errors/shared.rb:33
3345
+ #: ../lib/puppet/module_tool/errors/shared.rb:48
3330
3346
  msgid "Could not %{action} '%{module_name}'; no releases are available from %{source}"
3331
3347
  msgstr ""
3332
3348
 
3333
- #: ../lib/puppet/module_tool/errors/shared.rb:35
3349
+ #: ../lib/puppet/module_tool/errors/shared.rb:50
3334
3350
  msgid "Could not %{action} '%{module_name}'; no releases matching '%{version}' are available from %{source}"
3335
3351
  msgstr ""
3336
3352
 
3337
- #: ../lib/puppet/module_tool/errors/shared.rb:41
3353
+ #: ../lib/puppet/module_tool/errors/shared.rb:56
3338
3354
  msgid "Could not %{action} '%{module_name}' (%{version})"
3339
3355
  msgstr ""
3340
3356
 
3341
- #: ../lib/puppet/module_tool/errors/shared.rb:44
3357
+ #: ../lib/puppet/module_tool/errors/shared.rb:59
3342
3358
  msgid " Does '%{module_name}' have at least one published release?"
3343
3359
  msgstr ""
3344
3360
 
3345
- #: ../lib/puppet/module_tool/errors/shared.rb:46
3361
+ #: ../lib/puppet/module_tool/errors/shared.rb:61
3346
3362
  msgid " No releases matching '%{requested_version}' are available from %{source}"
3347
3363
  msgstr ""
3348
3364
 
3349
- #: ../lib/puppet/module_tool/errors/shared.rb:59
3365
+ #: ../lib/puppet/module_tool/errors/shared.rb:74
3350
3366
  msgid "'%{module_name}' (%{version}) requested; installation conflict"
3351
3367
  msgstr ""
3352
3368
 
3353
- #: ../lib/puppet/module_tool/errors/shared.rb:67
3369
+ #: ../lib/puppet/module_tool/errors/shared.rb:82
3354
3370
  msgid " Dependency '%{name}' (%{version}) would overwrite %{directory}"
3355
3371
  msgstr ""
3356
3372
 
3357
- #: ../lib/puppet/module_tool/errors/shared.rb:69
3373
+ #: ../lib/puppet/module_tool/errors/shared.rb:84
3358
3374
  msgid " Installation would overwrite %{directory}"
3359
3375
  msgstr ""
3360
3376
 
3361
- #: ../lib/puppet/module_tool/errors/shared.rb:73
3377
+ #: ../lib/puppet/module_tool/errors/shared.rb:88
3362
3378
  msgid " Currently, '%{current_name}' (%{current_version}) is installed to that directory"
3363
3379
  msgstr ""
3364
3380
 
3365
3381
  #. TRANSLATORS `puppet module install --ignore-dependencies` is a command line and should not be translated
3366
- #: ../lib/puppet/module_tool/errors/shared.rb:78
3382
+ #: ../lib/puppet/module_tool/errors/shared.rb:93
3367
3383
  msgid " Use `puppet module install --ignore-dependencies` to install only this module"
3368
3384
  msgstr ""
3369
3385
 
3370
3386
  #. TRANSLATORS `puppet module install --force` is a command line and should not be translated
3371
3387
  #. 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
3388
+ #: ../lib/puppet/module_tool/errors/shared.rb:96 ../lib/puppet/module_tool/errors/shared.rb:125
3373
3389
  msgid " Use `puppet module install --force` to install this module anyway"
3374
3390
  msgstr ""
3375
3391
 
3376
- #: ../lib/puppet/module_tool/errors/shared.rb:95
3392
+ #: ../lib/puppet/module_tool/errors/shared.rb:110
3377
3393
  msgid "'%{module_name}' (%{version}) requested; Invalid dependency cycle"
3378
3394
  msgstr ""
3379
3395
 
3380
- #: ../lib/puppet/module_tool/errors/shared.rb:100
3396
+ #: ../lib/puppet/module_tool/errors/shared.rb:115
3381
3397
  msgid "You specified '%{name}' (%{version})"
3382
3398
  msgstr ""
3383
3399
 
3384
3400
  #. 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
3401
+ #: ../lib/puppet/module_tool/errors/shared.rb:118
3386
3402
  msgid "This depends on '%{name}' (%{version})"
3387
3403
  msgstr ""
3388
3404
 
3389
- #: ../lib/puppet/module_tool/errors/shared.rb:107
3405
+ #: ../lib/puppet/module_tool/errors/shared.rb:122
3390
3406
  msgid " No version of '%{module_name}' will satisfy dependencies"
3391
3407
  msgstr ""
3392
3408
 
3393
- #: ../lib/puppet/module_tool/errors/shared.rb:120
3409
+ #: ../lib/puppet/module_tool/errors/shared.rb:135
3394
3410
  msgid "Could not %{action} '%{module_name}'; module is not installed"
3395
3411
  msgstr ""
3396
3412
 
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
3413
+ #: ../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
3414
  msgid "Could not %{action} module '%{module_name}'"
3399
3415
  msgstr ""
3400
3416
 
3401
- #: ../lib/puppet/module_tool/errors/shared.rb:126
3417
+ #: ../lib/puppet/module_tool/errors/shared.rb:141
3402
3418
  msgid " Module '%{module_name}' is not installed"
3403
3419
  msgstr ""
3404
3420
 
3405
3421
  #. TRANSLATORS `puppet module %{action} %{suggestion}` is a command line and should not be translated
3406
- #: ../lib/puppet/module_tool/errors/shared.rb:129
3422
+ #: ../lib/puppet/module_tool/errors/shared.rb:144
3407
3423
  msgid " You may have meant `puppet module %{action} %{suggestion}`"
3408
3424
  msgstr ""
3409
3425
 
3410
3426
  #. TRANSLATORS `puppet module install` is a command line and should not be translated
3411
- #: ../lib/puppet/module_tool/errors/shared.rb:132
3427
+ #: ../lib/puppet/module_tool/errors/shared.rb:147
3412
3428
  msgid " Use `puppet module install` to install this module"
3413
3429
  msgstr ""
3414
3430
 
3415
3431
  #. TRANSLATORS "module path" refers to a set of directories where modules may be installed
3416
- #: ../lib/puppet/module_tool/errors/shared.rb:143
3432
+ #: ../lib/puppet/module_tool/errors/shared.rb:158
3417
3433
  msgid "Could not %{action} '%{module_name}'; module appears in multiple places in the module path"
3418
3434
  msgstr ""
3419
3435
 
3420
- #: ../lib/puppet/module_tool/errors/shared.rb:149
3436
+ #: ../lib/puppet/module_tool/errors/shared.rb:164
3421
3437
  msgid " Module '%{module_name}' appears multiple places in the module path"
3422
3438
  msgstr ""
3423
3439
 
3424
3440
  #. 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
3441
+ #: ../lib/puppet/module_tool/errors/shared.rb:167
3426
3442
  msgid " '%{module_name}' (%{version}) was found in %{path}"
3427
3443
  msgstr ""
3428
3444
 
3429
3445
  #. TRANSLATORS `--modulepath` is command line option and should not be translated
3430
- #: ../lib/puppet/module_tool/errors/shared.rb:155
3446
+ #: ../lib/puppet/module_tool/errors/shared.rb:170
3431
3447
  msgid " Use the `--modulepath` option to limit the search to specific directories"
3432
3448
  msgstr ""
3433
3449
 
3434
- #: ../lib/puppet/module_tool/errors/shared.rb:166
3450
+ #: ../lib/puppet/module_tool/errors/shared.rb:181
3435
3451
  msgid "Could not %{action} '%{module_name}'; module has had changes made locally"
3436
3452
  msgstr ""
3437
3453
 
3438
- #: ../lib/puppet/module_tool/errors/shared.rb:172
3454
+ #: ../lib/puppet/module_tool/errors/shared.rb:187
3439
3455
  msgid " Installed module has had changes made locally"
3440
3456
  msgstr ""
3441
3457
 
3442
3458
  #. TRANSLATORS `puppet module %{action} --ignore-changes` is a command line and should not be translated
3443
- #: ../lib/puppet/module_tool/errors/shared.rb:174
3459
+ #: ../lib/puppet/module_tool/errors/shared.rb:189
3444
3460
  msgid " Use `puppet module %{action} --ignore-changes` to %{action} this module anyway"
3445
3461
  msgstr ""
3446
3462
 
3447
- #: ../lib/puppet/module_tool/errors/shared.rb:184
3463
+ #: ../lib/puppet/module_tool/errors/shared.rb:199
3448
3464
  msgid "Could not %{action} '%{module_name}'; %{error}"
3449
3465
  msgstr ""
3450
3466
 
3451
- #: ../lib/puppet/module_tool/errors/shared.rb:190
3467
+ #: ../lib/puppet/module_tool/errors/shared.rb:205
3452
3468
  msgid " Failure trying to parse metadata"
3453
3469
  msgstr ""
3454
3470
 
3455
- #: ../lib/puppet/module_tool/errors/shared.rb:191
3471
+ #: ../lib/puppet/module_tool/errors/shared.rb:206
3456
3472
  msgid " Original message was: %{message}"
3457
3473
  msgstr ""
3458
3474
 
@@ -3738,15 +3754,15 @@ msgstr ""
3738
3754
  msgid "Not a valid indirection type"
3739
3755
  msgstr ""
3740
3756
 
3741
- #: ../lib/puppet/network/http/connection.rb:43
3757
+ #: ../lib/puppet/network/http/connection.rb:47
3742
3758
  msgid "Unrecognized option(s): %{opts}"
3743
3759
  msgstr ""
3744
3760
 
3745
- #: ../lib/puppet/network/http/connection.rb:49
3761
+ #: ../lib/puppet/network/http/connection.rb:53
3746
3762
  msgid "Expected an instance of Puppet::SSL::Verifier but was passed a %{klass}"
3747
3763
  msgstr ""
3748
3764
 
3749
- #: ../lib/puppet/network/http/connection.rb:272
3765
+ #: ../lib/puppet/network/http/connection.rb:276
3750
3766
  msgid "Too many HTTP redirections for %{host}:%{port}"
3751
3767
  msgstr ""
3752
3768
 
@@ -3872,54 +3888,54 @@ msgstr ""
3872
3888
 
3873
3889
  #. TRANSLATORS: do not translate the variable names in this error message
3874
3890
  #. 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
3891
+ #: ../lib/puppet/pal/pal_impl.rb:76 ../lib/puppet/pal/pal_impl.rb:182
3876
3892
  msgid "manifest_file or code_string cannot be given when configured_by_env is true"
3877
3893
  msgstr ""
3878
3894
 
3879
- #: ../lib/puppet/pal/pal_impl.rb:222
3895
+ #: ../lib/puppet/pal/pal_impl.rb:238
3880
3896
  msgid "temporary environment name"
3881
3897
  msgstr ""
3882
3898
 
3883
3899
  #. TRANSLATORS: do not translate variable name string in these assertions
3884
- #: ../lib/puppet/pal/pal_impl.rb:227
3900
+ #: ../lib/puppet/pal/pal_impl.rb:243
3885
3901
  msgid "A block must be given to 'in_tmp_environment'"
3886
3902
  msgstr ""
3887
3903
 
3888
3904
  #. TRANSLATORS terms in the assertions below are names of terms in code
3889
- #: ../lib/puppet/pal/pal_impl.rb:282
3905
+ #: ../lib/puppet/pal/pal_impl.rb:298
3890
3906
  msgid "A block must be given to 'in_environment'"
3891
3907
  msgstr ""
3892
3908
 
3893
3909
  #. TRANSLATORS 'in_environment' is a name, do not translate
3894
- #: ../lib/puppet/pal/pal_impl.rb:287
3910
+ #: ../lib/puppet/pal/pal_impl.rb:303
3895
3911
  msgid "The environment directory '%{env_dir}' does not exist"
3896
3912
  msgstr ""
3897
3913
 
3898
- #: ../lib/puppet/pal/pal_impl.rb:310
3914
+ #: ../lib/puppet/pal/pal_impl.rb:326
3899
3915
  msgid "No directory found for the environment '%{env_name}' on the path '%{envpath}'"
3900
3916
  msgstr ""
3901
3917
 
3902
- #: ../lib/puppet/pal/pal_impl.rb:364
3918
+ #: ../lib/puppet/pal/pal_impl.rb:380
3903
3919
  msgid "Given variables must be a hash, got %{type}"
3904
3920
  msgstr ""
3905
3921
 
3906
- #: ../lib/puppet/pal/pal_impl.rb:370
3922
+ #: ../lib/puppet/pal/pal_impl.rb:386
3907
3923
  msgid "Given variable '%{varname}' has illegal name"
3908
3924
  msgstr ""
3909
3925
 
3910
- #: ../lib/puppet/pal/pal_impl.rb:374
3926
+ #: ../lib/puppet/pal/pal_impl.rb:390
3911
3927
  msgid "Given value for '%{varname}' has illegal type - got: %{type}"
3912
3928
  msgstr ""
3913
3929
 
3914
- #: ../lib/puppet/pal/pal_impl.rb:511
3930
+ #: ../lib/puppet/pal/pal_impl.rb:564
3915
3931
  msgid "Puppet Pal: %{what}"
3916
3932
  msgstr ""
3917
3933
 
3918
- #: ../lib/puppet/pal/pal_impl.rb:525
3934
+ #: ../lib/puppet/pal/pal_impl.rb:578
3919
3935
  msgid "Cannot use '%{a_term}' and '%{b_term}' at the same time"
3920
3936
  msgstr ""
3921
3937
 
3922
- #: ../lib/puppet/pal/pal_impl.rb:532
3938
+ #: ../lib/puppet/pal/pal_impl.rb:585
3923
3939
  msgid "A block must be given"
3924
3940
  msgstr ""
3925
3941
 
@@ -6326,19 +6342,19 @@ msgstr ""
6326
6342
  msgid "Mac OS X packages must specify a package source"
6327
6343
  msgstr ""
6328
6344
 
6329
- #: ../lib/puppet/provider/package/apt.rb:81
6345
+ #: ../lib/puppet/provider/package/apt.rb:85
6330
6346
  msgid "/etc/apt/sources.list contains a cdrom source; not installing. Use 'allowcdrom' to override this failure."
6331
6347
  msgstr ""
6332
6348
 
6333
- #: ../lib/puppet/provider/package/apt.rb:163 ../lib/puppet/provider/package/fink.rb:55
6349
+ #: ../lib/puppet/provider/package/apt.rb:167 ../lib/puppet/provider/package/fink.rb:55
6334
6350
  msgid "Could not find latest version"
6335
6351
  msgstr ""
6336
6352
 
6337
- #: ../lib/puppet/provider/package/apt.rb:174 ../lib/puppet/provider/package/fink.rb:66
6353
+ #: ../lib/puppet/provider/package/apt.rb:178 ../lib/puppet/provider/package/fink.rb:66
6338
6354
  msgid "Preseeding %{response} to debconf-set-selections"
6339
6355
  msgstr ""
6340
6356
 
6341
- #: ../lib/puppet/provider/package/apt.rb:178 ../lib/puppet/provider/package/fink.rb:70
6357
+ #: ../lib/puppet/provider/package/apt.rb:182 ../lib/puppet/provider/package/fink.rb:70
6342
6358
  msgid "No responsefile specified or non existent, not preseeding anything"
6343
6359
  msgstr ""
6344
6360
 
@@ -7043,69 +7059,69 @@ msgstr ""
7043
7059
  msgid "Not attempting to load %{type} %{fqname} as this object was missing during a prior compilation"
7044
7060
  msgstr ""
7045
7061
 
7046
- #: ../lib/puppet/settings.rb:101
7062
+ #: ../lib/puppet/settings.rb:102
7047
7063
  msgid "New environment loaders generated from the requested section."
7048
7064
  msgstr ""
7049
7065
 
7050
- #: ../lib/puppet/settings.rb:303
7066
+ #: ../lib/puppet/settings.rb:304
7051
7067
  msgid "Attempting to initialize global default settings more than once!"
7052
7068
  msgstr ""
7053
7069
 
7054
- #: ../lib/puppet/settings.rb:516
7070
+ #: ../lib/puppet/settings.rb:504
7055
7071
  msgid "Using --configprint is deprecated. Use 'puppet config <subcommand>' instead."
7056
7072
  msgstr ""
7057
7073
 
7058
- #: ../lib/puppet/settings.rb:658
7074
+ #: ../lib/puppet/settings.rb:646
7059
7075
  msgid "Could not load %{file}: %{detail}"
7060
7076
  msgstr ""
7061
7077
 
7062
- #: ../lib/puppet/settings.rb:766
7078
+ #: ../lib/puppet/settings.rb:755
7063
7079
  msgid "Invalid setting type '%{type}'"
7064
7080
  msgstr ""
7065
7081
 
7066
- #: ../lib/puppet/settings.rb:921
7082
+ #: ../lib/puppet/settings.rb:910
7067
7083
  msgid "Unknown searchpath case: %{source_type} for the %{source} settings path element."
7068
7084
  msgstr ""
7069
7085
 
7070
- #: ../lib/puppet/settings.rb:994
7086
+ #: ../lib/puppet/settings.rb:983
7071
7087
  msgid "setting definition for '%{name}' is not a hash!"
7072
7088
  msgstr ""
7073
7089
 
7074
- #: ../lib/puppet/settings.rb:999
7090
+ #: ../lib/puppet/settings.rb:988
7075
7091
  msgid "Setting %{name} is already defined"
7076
7092
  msgstr ""
7077
7093
 
7078
- #: ../lib/puppet/settings.rb:1005
7094
+ #: ../lib/puppet/settings.rb:994
7079
7095
  msgid "Setting %{name} is already using short name '%{short}'"
7080
7096
  msgstr ""
7081
7097
 
7082
- #: ../lib/puppet/settings.rb:1276
7098
+ #: ../lib/puppet/settings.rb:1265
7083
7099
  msgid "Setting %{name} is deprecated."
7084
7100
  msgstr ""
7085
7101
 
7086
7102
  #. TRANSLATORS 'puppet.conf' is a file name and should not be translated
7087
- #: ../lib/puppet/settings.rb:1281
7103
+ #: ../lib/puppet/settings.rb:1270
7088
7104
  msgid "Setting %{name} is deprecated in puppet.conf."
7089
7105
  msgstr ""
7090
7106
 
7091
- #: ../lib/puppet/settings.rb:1452
7107
+ #: ../lib/puppet/settings.rb:1447
7092
7108
  msgid "Error converting value for param '%{name}': %{detail}"
7093
7109
  msgstr ""
7094
7110
 
7095
- #: ../lib/puppet/settings.rb:1476
7111
+ #: ../lib/puppet/settings.rb:1471
7096
7112
  msgid "Could not find value for %{expression}"
7097
7113
  msgstr ""
7098
7114
 
7099
7115
  #. TRANSLATORS '$environment' is a Puppet specific variable and should not be translated
7100
- #: ../lib/puppet/settings.rb:1486
7116
+ #: ../lib/puppet/settings.rb:1481
7101
7117
  msgid "You cannot interpolate $environment within '%{setting_name}' when using directory environments."
7102
7118
  msgstr ""
7103
7119
 
7104
- #: ../lib/puppet/settings.rb:1487
7120
+ #: ../lib/puppet/settings.rb:1482
7105
7121
  msgid "Its value will remain %{value}."
7106
7122
  msgstr ""
7107
7123
 
7108
- #: ../lib/puppet/settings.rb:1518
7124
+ #: ../lib/puppet/settings.rb:1513
7109
7125
  msgid "Attempt to assign a value to unknown setting %{name}"
7110
7126
  msgstr ""
7111
7127
 
@@ -8426,7 +8442,7 @@ msgstr ""
8426
8442
  msgid "Could not autoload %{name}: %{detail}"
8427
8443
  msgstr ""
8428
8444
 
8429
- #: ../lib/puppet/util/autoload.rb:184
8445
+ #: ../lib/puppet/util/autoload.rb:177
8430
8446
  msgid "Autoload paths cannot be fully qualified"
8431
8447
  msgstr ""
8432
8448
 
@@ -8979,19 +8995,19 @@ msgstr ""
8979
8995
  msgid "Unable to write the file %{file_path}. %{error}"
8980
8996
  msgstr ""
8981
8997
 
8982
- #: ../lib/puppet/util/posix.rb:22
8998
+ #: ../lib/puppet/util/posix.rb:29
8983
8999
  msgid "Removing any duplicate group entries"
8984
9000
  msgstr ""
8985
9001
 
8986
- #: ../lib/puppet/util/posix.rb:35
9002
+ #: ../lib/puppet/util/posix.rb:75
8987
9003
  msgid "Did not get id from caller"
8988
9004
  msgstr ""
8989
9005
 
8990
- #: ../lib/puppet/util/posix.rb:39 ../lib/puppet/util/posix.rb:64
9006
+ #: ../lib/puppet/util/posix.rb:79 ../lib/puppet/util/posix.rb:104
8991
9007
  msgid "Tried to get %{field} field for silly id %{id}"
8992
9008
  msgstr ""
8993
9009
 
8994
- #: ../lib/puppet/util/posix.rb:92 ../lib/puppet/util/posix.rb:102 ../lib/puppet/util/posix.rb:112
9010
+ #: ../lib/puppet/util/posix.rb:132 ../lib/puppet/util/posix.rb:142 ../lib/puppet/util/posix.rb:152
8995
9011
  msgid "Can only handle users and groups"
8996
9012
  msgstr ""
8997
9013