diff options
| author | Chris Doherty <randomcamel@users.noreply.github.com> | 2016-03-14 11:52:57 -0700 |
|---|---|---|
| committer | Chris Doherty <randomcamel@users.noreply.github.com> | 2016-03-14 11:52:57 -0700 |
| commit | 3f07943715c31dd328dd104bba90d103b744323b (patch) | |
| tree | 6c624892dae94a48d39ecc6307336cac2aca86a3 /lib/chef | |
| parent | 365064280c93d519fdacbf032c0c21057e5549c9 (diff) | |
| parent | 4b9bd41caf15ba0d039e26887b53e7adbf837807 (diff) | |
| download | chef-3f07943715c31dd328dd104bba90d103b744323b.tar.gz | |
Merge pull request #4684 from chef/cd/fix-spurious-warnings
Fix issue 4334: eliminate spurious warnings.
Diffstat (limited to 'lib/chef')
| -rw-r--r-- | lib/chef/mixin/params_validate.rb | 4 | ||||
| -rw-r--r-- | lib/chef/property.rb | 7 |
2 files changed, 6 insertions, 5 deletions
diff --git a/lib/chef/mixin/params_validate.rb b/lib/chef/mixin/params_validate.rb index 598c6c3c23..b16df41c8e 100644 --- a/lib/chef/mixin/params_validate.rb +++ b/lib/chef/mixin/params_validate.rb @@ -466,7 +466,7 @@ class Chef # "value nil" and to keep default stickiness working exactly the same # @api private class SetOrReturnProperty < Chef::Property - def get(resource) + def get(resource, nil_set: false) value = super # All values are sticky, frozen or not if !is_set?(resource) @@ -478,7 +478,7 @@ class Chef def call(resource, value = NOT_PASSED) # setting to nil does a get if value.nil? && !explicitly_accepts_nil?(resource) - get(resource) + get(resource, nil_set: true) else super end diff --git a/lib/chef/property.rb b/lib/chef/property.rb index 95acdeea47..c36daa821a 100644 --- a/lib/chef/property.rb +++ b/lib/chef/property.rb @@ -266,7 +266,7 @@ class Chef # In Chef 12, value(nil) does a *get* instead of a set, so we # warn if the value would have been changed. In Chef 13, it will be # equivalent to value = nil. - result = get(resource) + result = get(resource, nil_set: true) # Warn about this becoming a set in Chef 13. begin @@ -311,7 +311,7 @@ class Chef # @raise Chef::Exceptions::ValidationFailed If the value is invalid for # this property, or if the value is required and not set. # - def get(resource) + def get(resource, nil_set: false) # If it's set, return it (and evaluate any lazy values) if is_set?(resource) value = get_value(resource) @@ -335,7 +335,8 @@ class Chef # # It won't do what they expect. This checks whether you try to *read* # `content` while we are compiling the resource. - if resource.respond_to?(:resource_initializing) && + if !nil_set && + resource.respond_to?(:resource_initializing) && resource.resource_initializing && resource.respond_to?(:enclosing_provider) && resource.enclosing_provider && |