summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoah Kantrowitz <noah@coderanger.net>2017-06-16 15:06:54 -0700
committerNoah Kantrowitz <noah@coderanger.net>2017-06-16 15:06:54 -0700
commit63ca03e5a824018441e0bb493557d4182640b548 (patch)
tree13812b5496f0845f1a7c983e69493640cc4cc051
parentb77c376a76cba7a6e41c72e7a0582805dca629eb (diff)
downloadchef-63ca03e5a824018441e0bb493557d4182640b548.tar.gz
Special case for the supports pseudo-property for Chef 12.
Signed-off-by: Noah Kantrowitz <noah@coderanger.net>
-rw-r--r--lib/chef/property.rb4
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/chef/property.rb b/lib/chef/property.rb
index 8fa290251a..d1be172ac2 100644
--- a/lib/chef/property.rb
+++ b/lib/chef/property.rb
@@ -657,6 +657,10 @@ class Chef
# as needed.
return if Chef::Resource.properties.keys.include?(name)
+ # Special case for `supports` as it was moved in Chef 13 and this is causing
+ # some user confusion in cookbooks that need to support both 12 and 13.
+ return if name.to_s == 'supports'
+
# Emit the deprecation.
resource_name = declared_in.respond_to?(:resource_name) ? declared_in.resource_name : declared_in
Chef.deprecated(:property_name_collision, "Property `#{name}` of resource `#{resource_name}` overwrites an existing method. " \