summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLamont Granquist <lamont@scriptkiddie.org>2015-12-17 12:35:15 -0800
committerLamont Granquist <lamont@scriptkiddie.org>2015-12-17 12:35:15 -0800
commit44172fd9e3b1128653687e7323839e6008763916 (patch)
tree2270b4469ca3feb6570ae8dca32066ad48d375d6
parentfc018ed28a5e3c7c33d20da1379620962a5e2df5 (diff)
downloadchef-lcg/property-nil-values.tar.gz
deprecation notice if nil is not acceptable at all.lcg/property-nil-values
-rw-r--r--lib/chef/property.rb4
1 files changed, 1 insertions, 3 deletions
diff --git a/lib/chef/property.rb b/lib/chef/property.rb
index 2c372bcf4b..6a7682bec5 100644
--- a/lib/chef/property.rb
+++ b/lib/chef/property.rb
@@ -263,9 +263,7 @@ class Chef
Chef.log_deprecation("#{name} nil currently does not overwrite the value of #{name}. This will change in Chef 13, and the value will be set to nil instead.")
end
else
- if !result.nil?
- Chef.log_deprecation("#{name} nil is now an allowed value of #{name}. This will change in Chef 13, and attempting to set this value will result in an exception.")
- end
+ Chef.log_deprecation("#{name} nil is not an allowed value of #{name}. This will change in Chef 13, and attempting to set this value will result in an exception.")
end
result
else