summaryrefslogtreecommitdiff
path: root/lib/chef/property.rb
diff options
context:
space:
mode:
authorJohn Keiser <john@johnkeiser.com>2015-09-25 07:20:03 -0700
committerJohn Keiser <john@johnkeiser.com>2015-09-25 12:22:19 -0700
commitaf422456552b8a64cb3ea90167a0f80f401790cf (patch)
tree7d5edfd97aefaf4884c6f941070ca12df58fffe6 /lib/chef/property.rb
parent424b2dda9b4a2a0ca3e7ca8c9a598643b303ec0f (diff)
downloadchef-af422456552b8a64cb3ea90167a0f80f401790cf.tar.gz
Fix up property deprecation text
Diffstat (limited to 'lib/chef/property.rb')
-rw-r--r--lib/chef/property.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/chef/property.rb b/lib/chef/property.rb
index 6c9d4619b1..011ff93aef 100644
--- a/lib/chef/property.rb
+++ b/lib/chef/property.rb
@@ -99,7 +99,7 @@ class Chef
if preferred_default == :default && options[:default].nil?
preferred_default = found_defaults[1]
end
- Chef::Log.deprecation("Cannot specify keys #{found_defaults.join(", ")} together on property #{options[:name]}--only one (#{preferred_default}) will be obeyed. In Chef 13, specifying multiple defaults will become an error.", caller(5..5)[0])
+ Chef.log_deprecation("Cannot specify keys #{found_defaults.join(", ")} together on property #{options[:name]}#{options[:resource_class] ? " of resource #{options[:resource_class].resource_name}" : ""}. Only one (#{preferred_default}) will be obeyed. In Chef 13, specifying multiple defaults will become an error.")
# Only honor the preferred default
options.reject! { |k,v| found_defaults.include?(k) && k != preferred_default }
end