puppet 6.15.0-x64-mingw32 → 6.16.0-x64-mingw32

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 (132) hide show
  1. checksums.yaml +4 -4
  2. data/CODEOWNERS +2 -7
  3. data/Gemfile.lock +17 -14
  4. data/lib/puppet.rb +32 -8
  5. data/lib/puppet/agent.rb +18 -4
  6. data/lib/puppet/application/agent.rb +1 -2
  7. data/lib/puppet/application/device.rb +1 -1
  8. data/lib/puppet/application/plugin.rb +1 -0
  9. data/lib/puppet/application/ssl.rb +1 -1
  10. data/lib/puppet/configurer.rb +2 -2
  11. data/lib/puppet/context/trusted_information.rb +14 -8
  12. data/lib/puppet/daemon.rb +13 -27
  13. data/lib/puppet/defaults.rb +19 -0
  14. data/lib/puppet/face/facts.rb +1 -1
  15. data/lib/puppet/face/help.rb +29 -3
  16. data/lib/puppet/face/module/search.rb +5 -0
  17. data/lib/puppet/face/plugin.rb +1 -1
  18. data/lib/puppet/file_serving/http_metadata.rb +1 -1
  19. data/lib/puppet/file_system/uniquefile.rb +4 -0
  20. data/lib/puppet/forge/repository.rb +7 -6
  21. data/lib/puppet/functions/filter.rb +1 -0
  22. data/lib/puppet/http/client.rb +22 -11
  23. data/lib/puppet/http/external_client.rb +0 -6
  24. data/lib/puppet/indirector/file_content/http.rb +5 -0
  25. data/lib/puppet/indirector/file_metadata/http.rb +4 -4
  26. data/lib/puppet/indirector/rest.rb +7 -1
  27. data/lib/puppet/network/http/compression.rb +7 -0
  28. data/lib/puppet/network/http/connection.rb +2 -0
  29. data/lib/puppet/network/http/connection_adapter.rb +182 -0
  30. data/lib/puppet/network/http/nocache_pool.rb +1 -0
  31. data/lib/puppet/network/http_pool.rb +2 -2
  32. data/lib/puppet/pal/catalog_compiler.rb +5 -0
  33. data/lib/puppet/pal/pal_impl.rb +4 -1
  34. data/lib/puppet/parser/compiler.rb +28 -25
  35. data/lib/puppet/parser/functions/filter.rb +1 -0
  36. data/lib/puppet/provider/package/aix.rb +17 -2
  37. data/lib/puppet/provider/package/apt.rb +4 -1
  38. data/lib/puppet/provider/package/dnfmodule.rb +24 -4
  39. data/lib/puppet/provider/package/pip.rb +60 -37
  40. data/lib/puppet/provider/package/portage.rb +2 -2
  41. data/lib/puppet/provider/package/yum.rb +7 -0
  42. data/lib/puppet/provider/package/zypper.rb +59 -1
  43. data/lib/puppet/provider/service/systemd.rb +21 -4
  44. data/lib/puppet/provider/user/useradd.rb +5 -1
  45. data/lib/puppet/reports/http.rb +5 -3
  46. data/lib/puppet/runtime.rb +25 -2
  47. data/lib/puppet/ssl/state_machine.rb +33 -8
  48. data/lib/puppet/ssl/verifier_adapter.rb +9 -1
  49. data/lib/puppet/test/test_helper.rb +1 -1
  50. data/lib/puppet/type/file/source.rb +1 -1
  51. data/lib/puppet/type/package.rb +16 -1
  52. data/lib/puppet/type/service.rb +6 -8
  53. data/lib/puppet/type/user.rb +1 -7
  54. data/lib/puppet/util/autoload.rb +1 -18
  55. data/lib/puppet/util/log/destinations.rb +1 -10
  56. data/lib/puppet/util/package/version/range.rb +4 -1
  57. data/lib/puppet/util/package/version/range/eq.rb +14 -0
  58. data/lib/puppet/version.rb +1 -1
  59. data/locales/puppet.pot +191 -111
  60. data/man/man5/puppet.conf.5 +21 -2
  61. data/man/man8/puppet-agent.8 +1 -1
  62. data/man/man8/puppet-apply.8 +1 -1
  63. data/man/man8/puppet-catalog.8 +1 -1
  64. data/man/man8/puppet-config.8 +1 -1
  65. data/man/man8/puppet-describe.8 +1 -1
  66. data/man/man8/puppet-device.8 +1 -1
  67. data/man/man8/puppet-doc.8 +1 -1
  68. data/man/man8/puppet-epp.8 +1 -1
  69. data/man/man8/puppet-facts.8 +1 -1
  70. data/man/man8/puppet-filebucket.8 +1 -1
  71. data/man/man8/puppet-generate.8 +1 -1
  72. data/man/man8/puppet-help.8 +6 -3
  73. data/man/man8/puppet-key.8 +1 -1
  74. data/man/man8/puppet-lookup.8 +1 -1
  75. data/man/man8/puppet-man.8 +1 -1
  76. data/man/man8/puppet-module.8 +4 -1
  77. data/man/man8/puppet-node.8 +1 -1
  78. data/man/man8/puppet-parser.8 +1 -1
  79. data/man/man8/puppet-plugin.8 +1 -1
  80. data/man/man8/puppet-report.8 +1 -1
  81. data/man/man8/puppet-resource.8 +1 -1
  82. data/man/man8/puppet-script.8 +1 -1
  83. data/man/man8/puppet-ssl.8 +1 -1
  84. data/man/man8/puppet-status.8 +1 -1
  85. data/man/man8/puppet.8 +2 -2
  86. data/spec/fixtures/unit/provider/package/dnfmodule/{dnf-module-list-enabled.txt → dnf-module-list.txt} +6 -0
  87. data/spec/fixtures/unit/provider/package/zypper/zypper-search-uninstalled.out +13 -0
  88. data/spec/integration/application/agent_spec.rb +66 -1
  89. data/spec/integration/application/plugin_spec.rb +23 -0
  90. data/spec/integration/http/client_spec.rb +6 -1
  91. data/spec/integration/network/http_pool_spec.rb +56 -0
  92. data/spec/integration/util/windows/adsi_spec.rb +5 -0
  93. data/spec/lib/puppet_spec/https.rb +6 -0
  94. data/spec/unit/agent_spec.rb +47 -1
  95. data/spec/unit/application/agent_spec.rb +4 -4
  96. data/spec/unit/context/trusted_information_spec.rb +17 -0
  97. data/spec/unit/daemon_spec.rb +5 -64
  98. data/spec/unit/face/module/search_spec.rb +17 -0
  99. data/spec/unit/file_system/uniquefile_spec.rb +11 -0
  100. data/spec/unit/http/client_spec.rb +10 -10
  101. data/spec/unit/http/external_client_spec.rb +9 -9
  102. data/spec/unit/indirector/catalog/compiler_spec.rb +1 -0
  103. data/spec/unit/indirector/file_metadata/http_spec.rb +167 -0
  104. data/spec/unit/indirector/file_metadata/rest_spec.rb +15 -14
  105. data/spec/unit/indirector/rest_spec.rb +13 -0
  106. data/spec/unit/network/http/connection_spec.rb +542 -190
  107. data/spec/unit/network/http/nocache_pool_spec.rb +22 -0
  108. data/spec/unit/network/http_pool_spec.rb +63 -57
  109. data/spec/unit/network/http_spec.rb +1 -1
  110. data/spec/unit/provider/package/aix_spec.rb +29 -0
  111. data/spec/unit/provider/package/dnfmodule_spec.rb +25 -5
  112. data/spec/unit/provider/package/pip_spec.rb +42 -16
  113. data/spec/unit/provider/package/portage_spec.rb +5 -0
  114. data/spec/unit/provider/package/yum_spec.rb +16 -8
  115. data/spec/unit/provider/package/zypper_spec.rb +84 -0
  116. data/spec/unit/provider/service/init_spec.rb +1 -0
  117. data/spec/unit/provider/service/openbsd_spec.rb +9 -0
  118. data/spec/unit/provider/service/openwrt_spec.rb +1 -0
  119. data/spec/unit/provider/service/redhat_spec.rb +9 -0
  120. data/spec/unit/provider/service/systemd_spec.rb +84 -13
  121. data/spec/unit/provider/user/useradd_spec.rb +8 -0
  122. data/spec/unit/puppet_pal_catalog_spec.rb +43 -0
  123. data/spec/unit/puppet_spec.rb +33 -0
  124. data/spec/unit/reports/http_spec.rb +1 -1
  125. data/spec/unit/ssl/state_machine_spec.rb +52 -8
  126. data/spec/unit/type/service_spec.rb +9 -8
  127. data/spec/unit/type/user_spec.rb +1 -1
  128. data/spec/unit/util/autoload_spec.rb +2 -1
  129. data/spec/unit/util/log/destinations_spec.rb +1 -29
  130. data/spec/unit/util/package/version/range_spec.rb +22 -1
  131. data/tasks/manpages.rake +5 -35
  132. metadata +10 -4
@@ -51,7 +51,11 @@ module Puppet
51
51
  desc "Whether a service should be enabled to start at boot.
52
52
  This property behaves differently depending on the platform;
53
53
  wherever possible, it relies on local tools to enable or disable
54
- a given service. Default values depend on the platform."
54
+ a given service. Default values depend on the platform.
55
+
56
+ If you don't specify a value for the `enable` attribute, Puppet leaves
57
+ that aspect of the service alone and your operating system determines
58
+ the behavior."
55
59
 
56
60
  newvalue(:true, :event => :service_enabled) do
57
61
  provider.enable
@@ -80,14 +84,8 @@ module Puppet
80
84
  provider.delayed_start
81
85
  end
82
86
 
83
- # This only makes sense on systemd systems. Static services cannot be enabled
84
- # or disabled manually.
85
87
  def insync?(current)
86
- if provider.respond_to?(:cached_enabled?) && provider.cached_enabled? == 'static'
87
- Puppet.debug("Unable to enable or disable static service #{@resource[:name]}")
88
- return true
89
- end
90
-
88
+ return provider.enabled_insync?(current) if provider.respond_to?(:enabled_insync?)
91
89
  super(current)
92
90
  end
93
91
 
@@ -736,17 +736,11 @@ module Puppet
736
736
  value = test_sym if [:true, :false].include? test_sym
737
737
 
738
738
  return [] if value == :false
739
- home = resource[:home]
740
- if value == :true and not home
741
- raise ArgumentError, _("purge_ssh_keys can only be true for users with a defined home directory")
742
- end
739
+ home = resource[:home] || Dir.home(resource[:name])
743
740
 
744
741
  return [ "#{home}/.ssh/authorized_keys" ] if value == :true
745
742
  # value is an array - munge each value
746
743
  [ value ].flatten.map do |entry|
747
- if entry =~ /^~|^%h/ and not home
748
- raise ArgumentError, _("purge_ssh_keys value '%{value}' meta character ~ or %{home_placeholder} only allowed for users with a defined home directory") % { value: value, home_placeholder: '%h' }
749
- end
750
744
  # make sure frozen value is duplicated by using a gsub, second mutating gsub! is then ok
751
745
  entry = entry.gsub(/^~\//, "#{home}/")
752
746
  entry.gsub!(/^%h\//, "#{home}/")
@@ -15,6 +15,7 @@ end
15
15
  # Autoload paths, either based on names or all at once.
16
16
  class Puppet::Util::Autoload
17
17
  include Puppet::Concurrent::Synchronized
18
+ extend Puppet::Concurrent::Synchronized
18
19
 
19
20
  @loaded = {}
20
21
 
@@ -127,19 +128,6 @@ class Puppet::Util::Autoload
127
128
  end.directories
128
129
  end
129
130
 
130
- # @api private
131
- def vendored_modules
132
- dir = Puppet[:vendormoduledir]
133
- if dir && File.directory?(dir)
134
- Dir.entries(dir)
135
- .reject { |f| f =~ /^\./ }
136
- .collect { |f| File.join(dir, f, "lib") }
137
- .find_all { |d| FileTest.directory?(d) }
138
- else
139
- []
140
- end
141
- end
142
-
143
131
  # @api private
144
132
  def gem_directories
145
133
  gem_source.directories
@@ -167,11 +155,6 @@ class Puppet::Util::Autoload
167
155
  # "app_defaults_initialized?" method on the main puppet Settings object.
168
156
  # --cprice 2012-03-16
169
157
  if Puppet.settings.app_defaults_initialized?
170
- unless @initialized
171
- $LOAD_PATH.unshift(Puppet[:libdir])
172
- $LOAD_PATH.concat(vendored_modules)
173
- @initialized = true
174
- end
175
158
  gem_directories + module_directories(env) + $LOAD_PATH
176
159
  else
177
160
  gem_directories + $LOAD_PATH
@@ -91,18 +91,9 @@ Puppet::Util::Log.newdesttype :file do
91
91
  end
92
92
  end
93
93
 
94
- file = File.open(path, File::WRONLY|File::CREAT|File::APPEND)
94
+ file = File.open(path, File::WRONLY|File::CREAT|File::APPEND)
95
95
  file.puts('[') if need_array_start
96
96
 
97
- # Give ownership to the user and group puppet will run as
98
- if Puppet.features.root? && !Puppet::Util::Platform.windows? && !file_exists
99
- begin
100
- FileUtils.chown(Puppet[:user], Puppet[:group], path)
101
- rescue ArgumentError, Errno::EPERM
102
- Puppet.err _("Unable to set ownership to %{user}:%{group} for log file: %{path}") % { user: Puppet[:user], group: Puppet[:group], path: path }
103
- end
104
- end
105
-
106
97
  @file = file
107
98
 
108
99
  @autoflush = Puppet[:autoflush]
@@ -2,6 +2,7 @@ require 'puppet/util/package/version/range/lt'
2
2
  require 'puppet/util/package/version/range/lt_eq'
3
3
  require 'puppet/util/package/version/range/gt'
4
4
  require 'puppet/util/package/version/range/gt_eq'
5
+ require 'puppet/util/package/version/range/eq'
5
6
  require 'puppet/util/package/version/range/min_max'
6
7
 
7
8
  module Puppet::Util::Package::Version
@@ -20,7 +21,7 @@ module Puppet::Util::Package::Version
20
21
  # * ex. `">1.0.0 <=2.3.0"`
21
22
  #
22
23
  RANGE_SPLIT = /\s+/
23
- FULL_REGEX = /\A((?:[<>=])+)(.+)\Z/
24
+ FULL_REGEX = /\A((?:[<>=])*)(.+)\Z/
24
25
 
25
26
  # @param range_string [String] the version range string to parse
26
27
  # @param version_class [Version] a version class implementing comparison operators and parse method
@@ -40,6 +41,8 @@ module Puppet::Util::Package::Version
40
41
  Lt.new(version_class::parse(version))
41
42
  when '<='
42
43
  LtEq.new(version_class::parse(version))
44
+ when ''
45
+ Eq.new(version_class::parse(version))
43
46
  else
44
47
  raise ValidationFailure, "Operator '#{operator}' is not implemented"
45
48
  end
@@ -0,0 +1,14 @@
1
+ require 'puppet/util/package/version/range/simple'
2
+
3
+ module Puppet::Util::Package::Version
4
+ class Range
5
+ class Eq < Simple
6
+ def to_s
7
+ "#{@version}"
8
+ end
9
+ def include?(version)
10
+ version == @version
11
+ end
12
+ end
13
+ end
14
+ end
@@ -6,7 +6,7 @@
6
6
  # Raketasks and such to set the version based on the output of `git describe`
7
7
 
8
8
  module Puppet
9
- PUPPETVERSION = '6.15.0'
9
+ PUPPETVERSION = '6.16.0'
10
10
 
11
11
  ##
12
12
  # version is a public API method intended to always provide a fast and
@@ -6,11 +6,11 @@
6
6
  #, fuzzy
7
7
  msgid ""
8
8
  msgstr ""
9
- "Project-Id-Version: Puppet automation framework 6.14.0-210-g48e54bcd2c\n"
9
+ "Project-Id-Version: Puppet automation framework 6.15.0-156-gc38342f706\n"
10
10
  "\n"
11
11
  "Report-Msgid-Bugs-To: https://tickets.puppetlabs.com\n"
12
- "POT-Creation-Date: 2020-04-21 01:04+0000\n"
13
- "PO-Revision-Date: 2020-04-21 01:04+0000\n"
12
+ "POT-Creation-Date: 2020-05-20 22:19+0000\n"
13
+ "PO-Revision-Date: 2020-05-20 22:19+0000\n"
14
14
  "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
15
15
  "Language-Team: LANGUAGE <LL@li.org>\n"
16
16
  "Language: \n"
@@ -48,21 +48,21 @@ msgstr ""
48
48
  msgid "Config file %{hiera_config} not found, using Hiera defaults"
49
49
  msgstr ""
50
50
 
51
- #: ../lib/puppet.rb:141
51
+ #: ../lib/puppet.rb:144
52
52
  msgid "Support for ruby version %{version} is deprecated and will be removed in a future release. See https://puppet.com/docs/puppet/latest/system_requirements.html for a list of supported ruby versions."
53
53
  msgstr ""
54
54
 
55
- #: ../lib/puppet.rb:203
55
+ #: ../lib/puppet.rb:230
56
56
  msgid "The environmentpath setting cannot be empty or nil."
57
57
  msgstr ""
58
58
 
59
59
  #. TRANSLATORS: `message` is an already translated string of why SSL failed to initialize
60
- #: ../lib/puppet.rb:233
60
+ #: ../lib/puppet.rb:257
61
61
  msgid "Failed to initialize SSL: %{message}"
62
62
  msgstr ""
63
63
 
64
64
  #. TRANSLATORS: `puppet agent -t` is a command and should not be translated
65
- #: ../lib/puppet.rb:235
65
+ #: ../lib/puppet.rb:259
66
66
  msgid "Run `puppet agent -t`"
67
67
  msgstr ""
68
68
 
@@ -72,27 +72,39 @@ msgid ""
72
72
  "Use 'puppet agent --enable' to re-enable."
73
73
  msgstr ""
74
74
 
75
- #: ../lib/puppet/agent.rb:63
75
+ #: ../lib/puppet/agent.rb:67
76
76
  msgid "Run of %{client_class} already in progress; skipping (%{lockfile_path} exists)"
77
77
  msgstr ""
78
78
 
79
- #: ../lib/puppet/agent.rb:66
79
+ #: ../lib/puppet/agent.rb:70
80
+ msgid "Exiting now because the maxwaitforlock timeout has been exceeded."
81
+ msgstr ""
82
+
83
+ #: ../lib/puppet/agent.rb:73
84
+ msgid "Another puppet instance is already running; --waitforlock flag used, waiting for running instance to finish."
85
+ msgstr ""
86
+
87
+ #: ../lib/puppet/agent.rb:74 ../lib/puppet/ssl/state_machine.rb:279 ../lib/puppet/ssl/state_machine.rb:310
88
+ msgid "Will try again in %{time} seconds."
89
+ msgstr ""
90
+
91
+ #: ../lib/puppet/agent.rb:79
80
92
  msgid "Execution of %{client_class} did not complete within %{runtimeout} seconds and was terminated."
81
93
  msgstr ""
82
94
 
83
- #: ../lib/puppet/agent.rb:71
95
+ #: ../lib/puppet/agent.rb:84
84
96
  msgid "Could not run %{client_class}: %{detail}"
85
97
  msgstr ""
86
98
 
87
- #: ../lib/puppet/agent.rb:78
99
+ #: ../lib/puppet/agent.rb:91
88
100
  msgid "Shutdown/restart in progress (%{status}); skipping run"
89
101
  msgstr ""
90
102
 
91
- #: ../lib/puppet/agent.rb:96
103
+ #: ../lib/puppet/agent.rb:109
92
104
  msgid "puppet agent: applying configuration"
93
105
  msgstr ""
94
106
 
95
- #: ../lib/puppet/agent.rb:119
107
+ #: ../lib/puppet/agent.rb:132
96
108
  msgid "Could not create instance of %{client_class}: %{detail}"
97
109
  msgstr ""
98
110
 
@@ -650,20 +662,20 @@ msgstr ""
650
662
  msgid "Attempted to pop, but already at root of the context stack."
651
663
  msgstr ""
652
664
 
653
- #: ../lib/puppet/context/trusted_information.rb:58
665
+ #: ../lib/puppet/context/trusted_information.rb:53
654
666
  msgid "TrustedInformation expected a certificate, but none was given."
655
667
  msgstr ""
656
668
 
657
- #: ../lib/puppet/context/trusted_information.rb:98 ../lib/puppet/parser/scope.rb:835
669
+ #: ../lib/puppet/context/trusted_information.rb:104 ../lib/puppet/parser/scope.rb:835
658
670
  msgid "Unsupported data type: '%{klass}'"
659
671
  msgstr ""
660
672
 
661
- #: ../lib/puppet/daemon.rb:83
662
- msgid "Cannot reexec unless ARGV arguments are set"
673
+ #: ../lib/puppet/daemon.rb:26
674
+ msgid "Daemons must have an agent"
663
675
  msgstr ""
664
676
 
665
- #: ../lib/puppet/daemon.rb:144
666
- msgid "Daemons must have an agent, server, or both"
677
+ #: ../lib/puppet/daemon.rb:81
678
+ msgid "Cannot reexec unless ARGV arguments are set"
667
679
  msgstr ""
668
680
 
669
681
  #: ../lib/puppet/datatypes.rb:133
@@ -1072,49 +1084,53 @@ msgstr ""
1072
1084
  msgid "The version of the subcommand for which to show help."
1073
1085
  msgstr ""
1074
1086
 
1087
+ #: ../lib/puppet/face/help.rb:28
1088
+ msgid "Whether to render the help text in ronn format."
1089
+ msgstr ""
1090
+
1075
1091
  #. TRANSLATORS 'puppet help' is a command line and should not be translated
1076
- #: ../lib/puppet/face/help.rb:37
1092
+ #: ../lib/puppet/face/help.rb:44
1077
1093
  msgid "The 'puppet help' command takes two (optional) arguments: a subcommand and an action"
1078
1094
  msgstr ""
1079
1095
 
1080
1096
  #. TRANSLATORS '--version' is a command line option and should not be translated
1081
- #: ../lib/puppet/face/help.rb:47
1097
+ #: ../lib/puppet/face/help.rb:54
1082
1098
  msgid "Supplying a '--version' only makes sense when a Faces subcommand is given"
1083
1099
  msgstr ""
1084
1100
 
1085
- #: ../lib/puppet/face/help.rb:55
1101
+ #: ../lib/puppet/face/help.rb:62
1086
1102
  msgid "The legacy subcommand '%{sub_command}' does not support supplying an action"
1087
1103
  msgstr ""
1088
1104
 
1089
- #: ../lib/puppet/face/help.rb:76
1105
+ #: ../lib/puppet/face/help.rb:102
1090
1106
  msgid "Could not load help for the application %{application_name}."
1091
1107
  msgstr ""
1092
1108
 
1093
- #: ../lib/puppet/face/help.rb:77 ../lib/puppet/face/help.rb:89
1109
+ #: ../lib/puppet/face/help.rb:103 ../lib/puppet/face/help.rb:115
1094
1110
  msgid "Please check the error logs for more information."
1095
1111
  msgstr ""
1096
1112
 
1097
- #: ../lib/puppet/face/help.rb:79 ../lib/puppet/face/help.rb:91
1113
+ #: ../lib/puppet/face/help.rb:105 ../lib/puppet/face/help.rb:117
1098
1114
  msgid "Detail: \"%{detail}\""
1099
1115
  msgstr ""
1100
1116
 
1101
- #: ../lib/puppet/face/help.rb:88
1117
+ #: ../lib/puppet/face/help.rb:114
1102
1118
  msgid "Could not load help for the face %{face_name}."
1103
1119
  msgstr ""
1104
1120
 
1105
- #: ../lib/puppet/face/help.rb:100
1121
+ #: ../lib/puppet/face/help.rb:126
1106
1122
  msgid "Unable to load action %{actionname} from %{face}"
1107
1123
  msgstr ""
1108
1124
 
1109
- #: ../lib/puppet/face/help.rb:144
1125
+ #: ../lib/puppet/face/help.rb:170
1110
1126
  msgid "(Deprecated)"
1111
1127
  msgstr ""
1112
1128
 
1113
- #: ../lib/puppet/face/help.rb:147 ../lib/puppet/face/help.rb:159
1129
+ #: ../lib/puppet/face/help.rb:173 ../lib/puppet/face/help.rb:185
1114
1130
  msgid "!%{sub_command}! Subcommand unavailable due to error."
1115
1131
  msgstr ""
1116
1132
 
1117
- #: ../lib/puppet/face/help.rb:148 ../lib/puppet/face/help.rb:160
1133
+ #: ../lib/puppet/face/help.rb:174 ../lib/puppet/face/help.rb:186
1118
1134
  msgid "Check error logs."
1119
1135
  msgstr ""
1120
1136
 
@@ -1271,15 +1287,19 @@ msgstr ""
1271
1287
  msgid "Search the Puppet Forge for a module."
1272
1288
  msgstr ""
1273
1289
 
1274
- #: ../lib/puppet/face/module/search.rb:12
1290
+ #: ../lib/puppet/face/module/search.rb:14
1275
1291
  msgid "Array of module metadata hashes"
1276
1292
  msgstr ""
1277
1293
 
1278
- #: ../lib/puppet/face/module/search.rb:22
1294
+ #: ../lib/puppet/face/module/search.rb:24
1279
1295
  msgid "<search_term>"
1280
1296
  msgstr ""
1281
1297
 
1282
- #: ../lib/puppet/face/module/search.rb:34
1298
+ #: ../lib/puppet/face/module/search.rb:27
1299
+ msgid "This action has been deprecated. Please use the Puppet Forge to search for modules."
1300
+ msgstr ""
1301
+
1302
+ #: ../lib/puppet/face/module/search.rb:37
1283
1303
  msgid "No results found for '%{term}'."
1284
1304
  msgstr ""
1285
1305
 
@@ -2226,11 +2246,11 @@ msgstr ""
2226
2246
  msgid "Request to %{uri} failed after %{elapsed} seconds: %{message}"
2227
2247
  msgstr ""
2228
2248
 
2229
- #: ../lib/puppet/http/client.rb:310
2249
+ #: ../lib/puppet/http/client.rb:321
2230
2250
  msgid "Sleeping for %{interval} seconds before retrying the request"
2231
2251
  msgstr ""
2232
2252
 
2233
- #: ../lib/puppet/http/client.rb:353 ../lib/puppet/indirector/request.rb:142
2253
+ #: ../lib/puppet/http/client.rb:364 ../lib/puppet/indirector/request.rb:142
2234
2254
  msgid "HTTP REST queries cannot handle values of type '%{klass}'"
2235
2255
  msgstr ""
2236
2256
 
@@ -2262,12 +2282,12 @@ msgstr ""
2262
2282
  msgid "Ignoring extra header \"%{name}\" as it has no value."
2263
2283
  msgstr ""
2264
2284
 
2265
- #: ../lib/puppet/http/service.rb:145 ../lib/puppet/indirector/rest.rb:282
2285
+ #: ../lib/puppet/http/service.rb:145 ../lib/puppet/indirector/rest.rb:288
2266
2286
  msgid "No content type in http response; cannot parse"
2267
2287
  msgstr ""
2268
2288
 
2269
2289
  #. TRANSLATORS "pson", "preferred_serialization_format", and "puppetserver" should not be translated
2270
- #: ../lib/puppet/http/service/report.rb:63
2290
+ #: ../lib/puppet/http/service/report.rb:61
2271
2291
  msgid "To submit reports to a server running puppetserver %{server_version}, set preferred_serialization_format to pson"
2272
2292
  msgstr ""
2273
2293
 
@@ -2416,7 +2436,7 @@ msgstr ""
2416
2436
  msgid "Unable to serialize catalog to json, retrying with pson"
2417
2437
  msgstr ""
2418
2438
 
2419
- #: ../lib/puppet/indirector/catalog/rest.rb:34 ../lib/puppet/indirector/facts/rest.rb:22 ../lib/puppet/indirector/file_content/rest.rb:33 ../lib/puppet/indirector/file_metadata/rest.rb:30 ../lib/puppet/indirector/node/rest.rb:25 ../lib/puppet/indirector/rest.rb:144 ../lib/puppet/indirector/status/rest.rb:21
2439
+ #: ../lib/puppet/indirector/catalog/rest.rb:34 ../lib/puppet/indirector/facts/rest.rb:22 ../lib/puppet/indirector/file_content/rest.rb:33 ../lib/puppet/indirector/file_metadata/rest.rb:30 ../lib/puppet/indirector/node/rest.rb:25 ../lib/puppet/indirector/rest.rb:146 ../lib/puppet/indirector/status/rest.rb:21
2420
2440
  msgid "Find %{uri} resulted in 404 with the message: %{body}"
2421
2441
  msgstr ""
2422
2442
 
@@ -2520,7 +2540,7 @@ msgstr ""
2520
2540
  msgid "You cannot save facts to the code store; it is only used for getting facts from a remote device"
2521
2541
  msgstr ""
2522
2542
 
2523
- #: ../lib/puppet/indirector/facts/rest.rb:30 ../lib/puppet/indirector/rest.rb:192
2543
+ #: ../lib/puppet/indirector/facts/rest.rb:30 ../lib/puppet/indirector/rest.rb:198
2524
2544
  msgid "PUT does not accept options"
2525
2545
  msgstr ""
2526
2546
 
@@ -2571,6 +2591,10 @@ msgstr ""
2571
2591
  msgid "Invalid checksum %{checksum}"
2572
2592
  msgstr ""
2573
2593
 
2594
+ #: ../lib/puppet/indirector/file_content/http.rb:14
2595
+ msgid "Puppet::Indirector::FileContent::Http is deprecated. Use Puppet::HTTP::Client instead."
2596
+ msgstr ""
2597
+
2574
2598
  #: ../lib/puppet/indirector/file_metadata/http.rb:25
2575
2599
  msgid "cannot lookup multiple files"
2576
2600
  msgstr ""
@@ -2799,16 +2823,36 @@ msgstr ""
2799
2823
  msgid "Resource instance does not match request key"
2800
2824
  msgstr ""
2801
2825
 
2802
- #: ../lib/puppet/indirector/rest.rb:177
2826
+ #: ../lib/puppet/indirector/rest.rb:115
2827
+ msgid "Puppet::Indirector::Rest#find is deprecated. Use Puppet::HTTP::Client instead."
2828
+ msgstr ""
2829
+
2830
+ #: ../lib/puppet/indirector/rest.rb:154
2831
+ msgid "Puppet::Indirector::Rest#head is deprecated. Use Puppet::HTTP::Client instead."
2832
+ msgstr ""
2833
+
2834
+ #: ../lib/puppet/indirector/rest.rb:167
2835
+ msgid "Puppet::Indirector::Rest#search is deprecated. Use Puppet::HTTP::Client instead."
2836
+ msgstr ""
2837
+
2838
+ #: ../lib/puppet/indirector/rest.rb:181
2839
+ msgid "Puppet::Indirector::Rest#destroy is deprecated. Use Puppet::HTTP::Client instead."
2840
+ msgstr ""
2841
+
2842
+ #: ../lib/puppet/indirector/rest.rb:182
2803
2843
  msgid "DELETE does not accept options"
2804
2844
  msgstr ""
2805
2845
 
2846
+ #: ../lib/puppet/indirector/rest.rb:197
2847
+ msgid "Puppet::Indirector::Rest#save is deprecated. Use Puppet::HTTP::Client instead."
2848
+ msgstr ""
2849
+
2806
2850
  #. TRANSLATORS "PSON" should not be translated
2807
- #: ../lib/puppet/indirector/rest.rb:229
2851
+ #: ../lib/puppet/indirector/rest.rb:235
2808
2852
  msgid "Downgrading to PSON for future requests"
2809
2853
  msgstr ""
2810
2854
 
2811
- #: ../lib/puppet/indirector/rest.rb:271 ../lib/puppet/rest/response.rb:31
2855
+ #: ../lib/puppet/indirector/rest.rb:277 ../lib/puppet/rest/response.rb:31
2812
2856
  msgid "Error %{code} on SERVER: %{returned_message}"
2813
2857
  msgstr ""
2814
2858
 
@@ -3923,10 +3967,34 @@ msgstr ""
3923
3967
  msgid "Application %{app} assigns multiple nodes to component %{comp}"
3924
3968
  msgstr ""
3925
3969
 
3926
- #: ../lib/puppet/network/http/compression.rb:30 ../lib/puppet/network/http/compression.rb:43
3970
+ #: ../lib/puppet/network/http/compression.rb:23 ../lib/puppet/network/http/compression.rb:27
3971
+ msgid "Puppet::Network::HTTP::Compression::Active#uncompress_body is deprecated."
3972
+ msgstr ""
3973
+
3974
+ #: ../lib/puppet/network/http/compression.rb:32 ../lib/puppet/network/http/compression.rb:46
3927
3975
  msgid "Unknown content encoding - %{encoding}"
3928
3976
  msgstr ""
3929
3977
 
3978
+ #: ../lib/puppet/network/http/compression.rb:37
3979
+ msgid "Puppet::Network::HTTP::Compression::Active#uncompress is deprecated."
3980
+ msgstr ""
3981
+
3982
+ #: ../lib/puppet/network/http/compression.rb:77
3983
+ msgid "Puppet::Network::HTTP::Compression::ZlibAdapter#uncompress is deprecated."
3984
+ msgstr ""
3985
+
3986
+ #: ../lib/puppet/network/http/compression.rb:104
3987
+ msgid "Puppet::Network::HTTP::Compression::None#uncompress_body is deprecated."
3988
+ msgstr ""
3989
+
3990
+ #: ../lib/puppet/network/http/compression.rb:113
3991
+ msgid "Puppet::Network::HTTP::Compression::None#uncompress is deprecated."
3992
+ msgstr ""
3993
+
3994
+ #: ../lib/puppet/network/http/compression.rb:120
3995
+ msgid "Puppet::Network::HTTP::Compression::IdentityAdapter#uncompress is deprecated."
3996
+ msgstr ""
3997
+
3930
3998
  #: ../lib/puppet/network/http/connection.rb:56
3931
3999
  msgid "Unrecognized option(s): %{opts}"
3932
4000
  msgstr ""
@@ -3935,7 +4003,7 @@ msgstr ""
3935
4003
  msgid "Expected an instance of Puppet::SSL::Verifier but was passed a %{klass}"
3936
4004
  msgstr ""
3937
4005
 
3938
- #: ../lib/puppet/network/http/connection.rb:229
4006
+ #: ../lib/puppet/network/http/connection.rb:229 ../lib/puppet/network/http/connection_adapter.rb:155
3939
4007
  msgid "Too many HTTP redirections for %{host}:%{port}"
3940
4008
  msgstr ""
3941
4009
 
@@ -3965,6 +4033,10 @@ msgstr ""
3965
4033
  msgid "request %{uri} failed: %{msg}"
3966
4034
  msgstr ""
3967
4035
 
4036
+ #: ../lib/puppet/network/http/connection.rb:346
4037
+ msgid "Puppet::Network::HTTP::Connection is deprecated. Please use Puppet::Network::HTTP::ConnectionAdapter instead."
4038
+ msgstr ""
4039
+
3968
4040
  #: ../lib/puppet/network/http/error.rb:23
3969
4041
  msgid "Not Acceptable: %{message}"
3970
4042
  msgstr ""
@@ -4009,7 +4081,11 @@ msgstr ""
4009
4081
  msgid "Could not resolve %{ip}: %{detail}"
4010
4082
  msgstr ""
4011
4083
 
4012
- #: ../lib/puppet/network/http/pool.rb:68
4084
+ #: ../lib/puppet/network/http/nocache_pool.rb:6
4085
+ msgid "Puppet::Network::HTTP::NoCachePool is deprecated."
4086
+ msgstr ""
4087
+
4088
+ #: ../lib/puppet/network/http/pool.rb:66
4013
4089
  msgid "Failed to close connection for %{site}: %{detail}"
4014
4090
  msgstr ""
4015
4091
 
@@ -4158,15 +4234,15 @@ msgstr ""
4158
4234
  msgid "Given value for '%{varname}' has illegal type - got: %{type}"
4159
4235
  msgstr ""
4160
4236
 
4161
- #: ../lib/puppet/pal/pal_impl.rb:482
4237
+ #: ../lib/puppet/pal/pal_impl.rb:485
4162
4238
  msgid "Puppet Pal: %{what}"
4163
4239
  msgstr ""
4164
4240
 
4165
- #: ../lib/puppet/pal/pal_impl.rb:496
4241
+ #: ../lib/puppet/pal/pal_impl.rb:499
4166
4242
  msgid "Cannot use '%{a_term}' and '%{b_term}' at the same time"
4167
4243
  msgstr ""
4168
4244
 
4169
- #: ../lib/puppet/pal/pal_impl.rb:503
4245
+ #: ../lib/puppet/pal/pal_impl.rb:506
4170
4246
  msgid "A block must be given"
4171
4247
  msgstr ""
4172
4248
 
@@ -4342,52 +4418,52 @@ msgstr ""
4342
4418
  msgid "Application %{app} maps component %{res} to multiple nodes"
4343
4419
  msgstr ""
4344
4420
 
4345
- #: ../lib/puppet/parser/compiler.rb:357
4421
+ #: ../lib/puppet/parser/compiler.rb:367
4422
+ msgid "Could not find node statement with name 'default' or '%{names}'"
4423
+ msgstr ""
4424
+
4425
+ #: ../lib/puppet/parser/compiler.rb:385
4346
4426
  msgid "No source for scope passed to evaluate_classes"
4347
4427
  msgstr ""
4348
4428
 
4349
- #: ../lib/puppet/parser/compiler.rb:373
4429
+ #: ../lib/puppet/parser/compiler.rb:401
4350
4430
  msgid "Could not find class %{name} for %{node}"
4351
4431
  msgstr ""
4352
4432
 
4353
- #: ../lib/puppet/parser/compiler.rb:475
4433
+ #: ../lib/puppet/parser/compiler.rb:503
4354
4434
  msgid "Capability mapping error: %{kind} clause references nonexistent %{component_type} %{component_name}"
4355
4435
  msgstr ""
4356
4436
 
4357
- #: ../lib/puppet/parser/compiler.rb:502
4358
- msgid "Could not find node statement with name 'default' or '%{names}'"
4359
- msgstr ""
4360
-
4361
- #: ../lib/puppet/parser/compiler.rb:523
4437
+ #: ../lib/puppet/parser/compiler.rb:526
4362
4438
  msgid "Evaluated collections"
4363
4439
  msgstr ""
4364
4440
 
4365
- #: ../lib/puppet/parser/compiler.rb:538
4441
+ #: ../lib/puppet/parser/compiler.rb:541
4366
4442
  msgid "Evaluated definitions"
4367
4443
  msgstr ""
4368
4444
 
4369
- #: ../lib/puppet/parser/compiler.rb:567
4445
+ #: ../lib/puppet/parser/compiler.rb:570
4370
4446
  msgid "Iterated (%{count}) on generators"
4371
4447
  msgstr ""
4372
4448
 
4373
- #: ../lib/puppet/parser/compiler.rb:578
4449
+ #: ../lib/puppet/parser/compiler.rb:581
4374
4450
  msgid "Somehow looped more than 1000 times while evaluating host catalog"
4375
4451
  msgstr ""
4376
4452
 
4377
- #: ../lib/puppet/parser/compiler.rb:610
4453
+ #: ../lib/puppet/parser/compiler.rb:613
4378
4454
  msgid "Could not find resource(s) %{resources} for overriding"
4379
4455
  msgstr ""
4380
4456
 
4381
- #: ../lib/puppet/parser/compiler.rb:621
4457
+ #: ../lib/puppet/parser/compiler.rb:624
4382
4458
  msgid "Failed to realize virtual resources %{resources}"
4383
4459
  msgstr ""
4384
4460
 
4385
4461
  #. TRANSLATORS "main" is a function name and should not be translated
4386
- #: ../lib/puppet/parser/compiler.rb:654
4462
+ #: ../lib/puppet/parser/compiler.rb:657
4387
4463
  msgid "Couldn't find main"
4388
4464
  msgstr ""
4389
4465
 
4390
- #: ../lib/puppet/parser/compiler.rb:727
4466
+ #: ../lib/puppet/parser/compiler.rb:730
4391
4467
  msgid "For initializing compiler"
4392
4468
  msgstr ""
4393
4469
 
@@ -6674,27 +6750,31 @@ msgstr ""
6674
6750
  msgid "Could not perform network device prefetch: %{detail}"
6675
6751
  msgstr ""
6676
6752
 
6677
- #: ../lib/puppet/provider/package/aix.rb:37
6753
+ #: ../lib/puppet/provider/package/aix.rb:46
6678
6754
  msgid "The aix provider can only be used by root"
6679
6755
  msgstr ""
6680
6756
 
6681
- #: ../lib/puppet/provider/package/aix.rb:79 ../lib/puppet/provider/package/nim.rb:53
6757
+ #: ../lib/puppet/provider/package/aix.rb:88 ../lib/puppet/provider/package/nim.rb:53
6682
6758
  msgid "Failed to uninstall package '%{name}'"
6683
6759
  msgstr ""
6684
6760
 
6685
- #: ../lib/puppet/provider/package/aix.rb:86
6761
+ #: ../lib/puppet/provider/package/aix.rb:95
6686
6762
  msgid "A directory is required which will be used to find packages"
6687
6763
  msgstr ""
6688
6764
 
6689
- #: ../lib/puppet/provider/package/aix.rb:98
6765
+ #: ../lib/puppet/provider/package/aix.rb:107
6690
6766
  msgid "aix package provider is unable to downgrade packages"
6691
6767
  msgstr ""
6692
6768
 
6693
- #: ../lib/puppet/provider/package/aix.rb:118
6769
+ #: ../lib/puppet/provider/package/aix.rb:112
6770
+ msgid "Package '%{name}' is in a %{status} state and requires manual intervention"
6771
+ msgstr ""
6772
+
6773
+ #: ../lib/puppet/provider/package/aix.rb:133
6694
6774
  msgid "Could not list installed Packages: %{detail}"
6695
6775
  msgstr ""
6696
6776
 
6697
- #: ../lib/puppet/provider/package/aix.rb:141 ../lib/puppet/provider/package/yum.rb:316
6777
+ #: ../lib/puppet/provider/package/aix.rb:156 ../lib/puppet/provider/package/yum.rb:332
6698
6778
  msgid "Tried to get latest on a missing package"
6699
6779
  msgstr ""
6700
6780
 
@@ -6714,19 +6794,19 @@ msgstr ""
6714
6794
  msgid "/etc/apt/sources.list contains a cdrom source; not installing. Use 'allowcdrom' to override this failure."
6715
6795
  msgstr ""
6716
6796
 
6717
- #: ../lib/puppet/provider/package/apt.rb:126 ../lib/puppet/provider/package/fink.rb:55
6797
+ #: ../lib/puppet/provider/package/apt.rb:129 ../lib/puppet/provider/package/fink.rb:55
6718
6798
  msgid "Could not find latest version"
6719
6799
  msgstr ""
6720
6800
 
6721
- #: ../lib/puppet/provider/package/apt.rb:137 ../lib/puppet/provider/package/fink.rb:66
6801
+ #: ../lib/puppet/provider/package/apt.rb:140 ../lib/puppet/provider/package/fink.rb:66
6722
6802
  msgid "Preseeding %{response} to debconf-set-selections"
6723
6803
  msgstr ""
6724
6804
 
6725
- #: ../lib/puppet/provider/package/apt.rb:141 ../lib/puppet/provider/package/fink.rb:70
6805
+ #: ../lib/puppet/provider/package/apt.rb:144 ../lib/puppet/provider/package/fink.rb:70
6726
6806
  msgid "No responsefile specified or non existent, not preseeding anything"
6727
6807
  msgstr ""
6728
6808
 
6729
- #: ../lib/puppet/provider/package/aptitude.rb:21 ../lib/puppet/provider/package/ports.rb:20 ../lib/puppet/provider/package/portupgrade.rb:94 ../lib/puppet/provider/package/portupgrade.rb:152 ../lib/puppet/provider/package/rug.rb:28 ../lib/puppet/provider/package/up2date.rb:17 ../lib/puppet/provider/package/yum.rb:296 ../lib/puppet/provider/package/zypper.rb:109
6809
+ #: ../lib/puppet/provider/package/aptitude.rb:21 ../lib/puppet/provider/package/ports.rb:20 ../lib/puppet/provider/package/portupgrade.rb:94 ../lib/puppet/provider/package/portupgrade.rb:152 ../lib/puppet/provider/package/rug.rb:28 ../lib/puppet/provider/package/up2date.rb:17 ../lib/puppet/provider/package/yum.rb:312 ../lib/puppet/provider/package/zypper.rb:146
6730
6810
  msgid "Could not find package %{name}"
6731
6811
  msgstr ""
6732
6812
 
@@ -7049,23 +7129,23 @@ msgstr ""
7049
7129
  msgid "Don't know how to install '%{source}'"
7050
7130
  msgstr ""
7051
7131
 
7052
- #: ../lib/puppet/provider/package/yum.rb:64
7132
+ #: ../lib/puppet/provider/package/yum.rb:69
7053
7133
  msgid "The yum provider can only be used as root"
7054
7134
  msgstr ""
7055
7135
 
7056
- #: ../lib/puppet/provider/package/yum.rb:118
7136
+ #: ../lib/puppet/provider/package/yum.rb:123
7057
7137
  msgid "Could not check for updates, '%{cmd} check-update' exited with %{status}"
7058
7138
  msgstr ""
7059
7139
 
7060
- #: ../lib/puppet/provider/package/yum.rb:152
7140
+ #: ../lib/puppet/provider/package/yum.rb:158
7061
7141
  msgid "Failed to parse package name and architecture from '%{pkgname}'"
7062
7142
  msgstr ""
7063
7143
 
7064
- #: ../lib/puppet/provider/package/yum.rb:290
7144
+ #: ../lib/puppet/provider/package/yum.rb:306
7065
7145
  msgid "Could not find package %{wanted}"
7066
7146
  msgstr ""
7067
7147
 
7068
- #: ../lib/puppet/provider/package/yum.rb:301
7148
+ #: ../lib/puppet/provider/package/yum.rb:317
7069
7149
  msgid "Failed to update to version %{should}, got version %{version} instead"
7070
7150
  msgstr ""
7071
7151
 
@@ -7252,7 +7332,7 @@ msgstr ""
7252
7332
  msgid "You must pass a callback for non-NONE events"
7253
7333
  msgstr ""
7254
7334
 
7255
- #: ../lib/puppet/reports/http.rb:37
7335
+ #: ../lib/puppet/reports/http.rb:38
7256
7336
  msgid "Unable to submit report to %{url} [%{code}] %{message}"
7257
7337
  msgstr ""
7258
7338
 
@@ -8107,20 +8187,24 @@ msgstr ""
8107
8187
  msgid "Couldn't fetch certificate from CA server; you might still need to sign this agent's certificate (%{name}). Exiting now because the maxwaitforcert timeout has been exceeded."
8108
8188
  msgstr ""
8109
8189
 
8110
- #: ../lib/puppet/ssl/state_machine.rb:279
8111
- msgid "Will try again in %{time} seconds."
8190
+ #: ../lib/puppet/ssl/state_machine.rb:305
8191
+ msgid "Another puppet instance is already running and the waitforlock setting is set to 0; exiting"
8112
8192
  msgstr ""
8113
8193
 
8114
- #: ../lib/puppet/ssl/state_machine.rb:402
8115
- msgid "Verified client certificate '%{subject}' fingerprint %{digest}"
8194
+ #: ../lib/puppet/ssl/state_machine.rb:307
8195
+ msgid "Another puppet instance is already running and the maxwaitforlock timeout has been exceeded; exiting"
8116
8196
  msgstr ""
8117
8197
 
8118
- #: ../lib/puppet/ssl/state_machine.rb:404
8119
- msgid "Verified CA certificate '%{subject}' fingerprint %{digest}"
8198
+ #: ../lib/puppet/ssl/state_machine.rb:309
8199
+ msgid "Another puppet instance is already running; waiting for it to finish"
8200
+ msgstr ""
8201
+
8202
+ #: ../lib/puppet/ssl/state_machine.rb:427
8203
+ msgid "Verified client certificate '%{subject}' fingerprint %{digest}"
8120
8204
  msgstr ""
8121
8205
 
8122
- #: ../lib/puppet/ssl/state_machine.rb:430
8123
- msgid "Another puppet instance is already running; exiting"
8206
+ #: ../lib/puppet/ssl/state_machine.rb:429
8207
+ msgid "Verified CA certificate '%{subject}' fingerprint %{digest}"
8124
8208
  msgstr ""
8125
8209
 
8126
8210
  #. TRANSLATORS: `error` is an untranslated message from openssl describing why a certificate in the server's chain is invalid, and `subject` is the identity/name of the failed certificate
@@ -8662,27 +8746,35 @@ msgstr ""
8662
8746
  msgid "Invalid GID %{gid}"
8663
8747
  msgstr ""
8664
8748
 
8665
- #: ../lib/puppet/type/package.rb:121 ../lib/puppet/type/package.rb:135
8749
+ #: ../lib/puppet/type/package.rb:128 ../lib/puppet/type/package.rb:142
8666
8750
  msgid "Could not update: %{detail}"
8667
8751
  msgstr ""
8668
8752
 
8669
- #: ../lib/puppet/type/package.rb:170
8753
+ #: ../lib/puppet/type/package.rb:177
8670
8754
  msgid "Could not get latest version: %{detail}"
8671
8755
  msgstr ""
8672
8756
 
8673
- #: ../lib/puppet/type/package.rb:270
8757
+ #: ../lib/puppet/type/package.rb:277
8674
8758
  msgid "Name must be a String not %{klass}"
8675
8759
  msgstr ""
8676
8760
 
8677
- #: ../lib/puppet/type/package.rb:510
8761
+ #: ../lib/puppet/type/package.rb:423
8762
+ msgid "Cannot have both `ensure => disabled` and `flavor`"
8763
+ msgstr ""
8764
+
8765
+ #: ../lib/puppet/type/package.rb:522
8678
8766
  msgid "Cannot have both `enable_only => true` and `flavor`"
8679
8767
  msgstr ""
8680
8768
 
8681
- #: ../lib/puppet/type/package.rb:672
8769
+ #: ../lib/puppet/type/package.rb:525
8770
+ msgid "Cannot have both `ensure => disabled` and `enable_only => true`"
8771
+ msgstr ""
8772
+
8773
+ #: ../lib/puppet/type/package.rb:687
8682
8774
  msgid "Invalid hold value %{value}. %{doc}"
8683
8775
  msgstr ""
8684
8776
 
8685
- #: ../lib/puppet/type/package.rb:702
8777
+ #: ../lib/puppet/type/package.rb:717
8686
8778
  msgid "You cannot use \"mark\" property while \"ensure\" is one of [\"absent\", \"purged\", \"held\"]"
8687
8779
  msgstr ""
8688
8780
 
@@ -8738,11 +8830,11 @@ msgstr ""
8738
8830
  msgid "%{value} is not a valid day of the week"
8739
8831
  msgstr ""
8740
8832
 
8741
- #: ../lib/puppet/type/service.rb:96
8833
+ #: ../lib/puppet/type/service.rb:90
8742
8834
  msgid "Setting enable to %{value} is only supported on Microsoft Windows."
8743
8835
  msgstr ""
8744
8836
 
8745
- #: ../lib/puppet/type/service.rb:253
8837
+ #: ../lib/puppet/type/service.rb:247
8746
8838
  msgid "\"%{value}\" is not a positive integer: the timeout parameter must be specified as a positive integer"
8747
8839
  msgstr ""
8748
8840
 
@@ -8855,15 +8947,7 @@ msgstr ""
8855
8947
  msgid "purge_ssh_keys must be true, false, or an array of file names, not %{value}"
8856
8948
  msgstr ""
8857
8949
 
8858
- #: ../lib/puppet/type/user.rb:741
8859
- msgid "purge_ssh_keys can only be true for users with a defined home directory"
8860
- msgstr ""
8861
-
8862
- #: ../lib/puppet/type/user.rb:748
8863
- msgid "purge_ssh_keys value '%{value}' meta character ~ or %{home_placeholder} only allowed for users with a defined home directory"
8864
- msgstr ""
8865
-
8866
- #: ../lib/puppet/type/user.rb:763
8950
+ #: ../lib/puppet/type/user.rb:757
8867
8951
  msgid "Class name must be provided."
8868
8952
  msgstr ""
8869
8953
 
@@ -8962,11 +9046,11 @@ msgstr ""
8962
9046
  msgid "Failed to abandon a child process contract"
8963
9047
  msgstr ""
8964
9048
 
8965
- #: ../lib/puppet/util/autoload.rb:74
9049
+ #: ../lib/puppet/util/autoload.rb:75
8966
9050
  msgid "Could not autoload %{name}: %{detail}"
8967
9051
  msgstr ""
8968
9052
 
8969
- #: ../lib/puppet/util/autoload.rb:199
9053
+ #: ../lib/puppet/util/autoload.rb:182
8970
9054
  msgid "Autoload paths cannot be fully qualified"
8971
9055
  msgstr ""
8972
9056
 
@@ -9497,10 +9581,6 @@ msgstr ""
9497
9581
  msgid "Creating log directory %{dir}"
9498
9582
  msgstr ""
9499
9583
 
9500
- #: ../lib/puppet/util/log/destinations.rb:102
9501
- msgid "Unable to set ownership to %{user}:%{group} for log file: %{path}"
9502
- msgstr ""
9503
-
9504
9584
  #: ../lib/puppet/util/logging.rb:81 ../lib/puppet/util/logging.rb:105
9505
9585
  msgid "Wrapped exception:"
9506
9586
  msgstr ""
@@ -9538,7 +9618,7 @@ msgstr ""
9538
9618
  msgid "%{value} is an invalid url"
9539
9619
  msgstr ""
9540
9620
 
9541
- #: ../lib/puppet/util/package/version/rpm.rb:47
9621
+ #: ../lib/puppet/util/package/version/rpm.rb:40
9542
9622
  msgid "Cannot compare, as %{other} is not a Rpm Version"
9543
9623
  msgstr ""
9544
9624