diff options
| author | Tim Smith <tsmith@chef.io> | 2018-09-18 07:20:31 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-18 07:20:31 -0700 |
| commit | 842751b994a432e7d1f17db980197649fa797e2b (patch) | |
| tree | 5a845b9f0b805c899548f1cf5beb8b1df435002e | |
| parent | 40b8acd67066c807d95c8133d25a8761dd5800dc (diff) | |
| parent | 08f71a1b9df3e163306cd8522324d686eba66f9e (diff) | |
| download | chef-842751b994a432e7d1f17db980197649fa797e2b.tar.gz | |
Merge pull request #7651 from chef/script_resource
Update script resource deprecation waring
| -rw-r--r-- | chef-config/lib/chef-config/path_helper.rb | 2 | ||||
| -rw-r--r-- | lib/chef/client.rb | 2 | ||||
| -rw-r--r-- | lib/chef/provider/script.rb | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/chef-config/lib/chef-config/path_helper.rb b/chef-config/lib/chef-config/path_helper.rb index 84217b9591..de71d483d5 100644 --- a/chef-config/lib/chef-config/path_helper.rb +++ b/chef-config/lib/chef-config/path_helper.rb @@ -267,7 +267,7 @@ module ChefConfig # Determine if the given path is protected by OS X System Integrity Protection. def self.is_sip_path?(path, node) if node["platform"] == "mac_os_x" && Gem::Version.new(node["platform_version"]) >= Gem::Version.new("10.11") - # todo: parse rootless.conf for this? + # @todo: parse rootless.conf for this? sip_paths = [ "/System", "/bin", "/sbin", "/usr" ] diff --git a/lib/chef/client.rb b/lib/chef/client.rb index 33d625c54e..770cdea32c 100644 --- a/lib/chef/client.rb +++ b/lib/chef/client.rb @@ -157,7 +157,7 @@ class Chef event_handlers += Array(Chef::Config[:event_handlers]) @events = EventDispatch::Dispatcher.new(*event_handlers) - # TODO it seems like a bad idea to be deletin' other peoples' hashes. + # @todo it seems like a bad idea to be deletin' other peoples' hashes. @override_runlist = args.delete(:override_runlist) @specific_recipes = args.delete(:specific_recipes) @run_status = Chef::RunStatus.new(nil, events) diff --git a/lib/chef/provider/script.rb b/lib/chef/provider/script.rb index c5966370f7..444eac54ac 100644 --- a/lib/chef/provider/script.rb +++ b/lib/chef/provider/script.rb @@ -49,9 +49,9 @@ class Chef def load_current_resource super - # @todo Chef-13: change this to an exception + # @todo Chef-15: change this to an exception if code.nil? - logger.warn "#{new_resource}: No code attribute was given, resource does nothing, this behavior is deprecated and will be removed in Chef-13" + logger.warn "#{new_resource}: No code attribute was given, resource does nothing, this behavior is deprecated and will be removed in Chef 15 (April 2019)" end end |