diff options
author | Tyler Ball <tyler-ball@users.noreply.github.com> | 2015-08-21 10:05:41 -0600 |
---|---|---|
committer | Tyler Ball <tyler-ball@users.noreply.github.com> | 2015-08-21 10:05:41 -0600 |
commit | 88752a692e8a17a44174e7f6411b58790684d141 (patch) | |
tree | 7522099e95eb5a74114ea59c61dd6cb33744cfe5 /lib/chef | |
parent | c832f38fbf26dce0a8e323318b33937cb4a44243 (diff) | |
parent | 82f328a811bf4c8a71277d56bfffa631d5f565f5 (diff) | |
download | chef-88752a692e8a17a44174e7f6411b58790684d141.tar.gz |
Merge pull request #3663 from docwhat/issue-3614
Fix error message for providers without `provides`
Diffstat (limited to 'lib/chef')
-rw-r--r-- | lib/chef/platform/provider_mapping.rb | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/lib/chef/platform/provider_mapping.rb b/lib/chef/platform/provider_mapping.rb index 38dd0e38af..9b511f0237 100644 --- a/lib/chef/platform/provider_mapping.rb +++ b/lib/chef/platform/provider_mapping.rb @@ -200,14 +200,13 @@ class Chef class_name = resource_type.class.name ? resource_type.class.name.split('::').last : convert_to_class_name(resource_type.resource_name.to_s) - begin - result = Chef::Provider.const_get(class_name) - Chef::Log.warn("Class Chef::Provider::#{class_name} does not declare 'resource_name #{convert_to_snake_case(class_name).to_sym.inspect}'.") - Chef::Log.warn("This will no longer work in Chef 13: you must use 'resource_name' to provide DSL.") - rescue NameError + if Chef::Provider.const_defined?(class_name) + 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 use the resource's DSL.") + return Chef::Provider.const_get(class_name) end end - result + nil end end |