diff options
| author | varac <varacanero@zeromail.org> | 2017-01-13 12:41:58 +0100 |
|---|---|---|
| committer | varac <varacanero@zeromail.org> | 2017-01-13 12:41:58 +0100 |
| commit | 066c08f8362d53f0f30897cb8710d11260c726ea (patch) | |
| tree | a6369eecd88bb731fe413d0bbc8af73d74d1f447 /lib/puppet/parser/functions/defined_with_params.rb | |
| parent | 71123634744b9fe2ec7d6a3e38e9789fd84801e3 (diff) | |
| parent | b65dd1f45d10e10e45455358aeabb29167990e2c (diff) | |
Merge remote-tracking branch 'origin/master' into leap_master
Diffstat (limited to 'lib/puppet/parser/functions/defined_with_params.rb')
| -rw-r--r-- | lib/puppet/parser/functions/defined_with_params.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/puppet/parser/functions/defined_with_params.rb b/lib/puppet/parser/functions/defined_with_params.rb index d7df306..99687ae 100644 --- a/lib/puppet/parser/functions/defined_with_params.rb +++ b/lib/puppet/parser/functions/defined_with_params.rb @@ -26,7 +26,10 @@ ENDOFDOC ret = false if resource = findresource(reference.to_s) matches = params.collect do |key, value| - resource[key] == value + # eql? avoids bugs caused by monkeypatching in puppet + resource_is_undef = resource[key].eql?(:undef) || resource[key].nil? + value_is_undef = value.eql?(:undef) || value.nil? + (resource_is_undef && value_is_undef) || (resource[key] == value) end ret = params.empty? || !matches.include?(false) end |