diff options
author | John Keiser <john@johnkeiser.com> | 2015-05-07 14:56:31 -0700 |
---|---|---|
committer | John Keiser <john@johnkeiser.com> | 2015-05-13 13:43:15 -0700 |
commit | 1575f7f2ef6b661a8b6ad33d74676ede764bcf2a (patch) | |
tree | 24591c6fdf2e3e60ce19ceeb86f0dd15bb1f6602 | |
parent | 3f04e9ea39d7ca332de9349d423db30863fc7dfa (diff) | |
download | chef-1575f7f2ef6b661a8b6ad33d74676ede764bcf2a.tar.gz |
Fix exception thrown from deprecation warning
-rw-r--r-- | lib/chef/platform/provider_mapping.rb | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/chef/platform/provider_mapping.rb b/lib/chef/platform/provider_mapping.rb index 8e9f46619f..faebc4f7f5 100644 --- a/lib/chef/platform/provider_mapping.rb +++ b/lib/chef/platform/provider_mapping.rb @@ -462,20 +462,20 @@ class Chef pmap.has_key?(rtkey) ? pmap[rtkey] : nil end + include Chef::Mixin::ConvertToClassName + def resource_matching_provider(platform, version, resource_type) if resource_type.kind_of?(Chef::Resource) + class_name = resource_type.class.to_s.split('::').last + begin - class_name = resource_type.class.to_s.split('::').last result = Chef::Provider.const_get(class_name) - Chef::Log.warn("Class Chef::Provider::#{class_name} does not declare 'provides #{resource.resource_name.inspect}'.") + Chef::Log.warn("Class Chef::Provider::#{class_name} does not declare 'provides #{convert_to_snake_case(class_name).to_sym.inspect}'.") Chef::Log.warn("This will no longer work in Chef 13: you must use 'provides' to provide DSL.") - result rescue NameError - nil end - else - nil end + result end end |