diff options
| author | Lamont Granquist <lamont@scriptkiddie.org> | 2014-11-21 18:03:32 -0800 |
|---|---|---|
| committer | Lamont Granquist <lamont@scriptkiddie.org> | 2014-11-21 18:03:32 -0800 |
| commit | 68dd5f42273f19bc5975c0dc8ed46ee592764eec (patch) | |
| tree | 35ba4769b0a02b5ac35bd7531f79420ea9a713d3 /lib/chef/node/attribute.rb | |
| parent | 3f4d86705c2b72da257fcbdc782c18c3b96b3205 (diff) | |
| download | chef-68dd5f42273f19bc5975c0dc8ed46ee592764eec.tar.gz | |
WIP: immutabilizing deep mergelcg/remove-knockout-merge
Diffstat (limited to 'lib/chef/node/attribute.rb')
| -rw-r--r-- | lib/chef/node/attribute.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/chef/node/attribute.rb b/lib/chef/node/attribute.rb index 6c41e230ee..3c48f653eb 100644 --- a/lib/chef/node/attribute.rb +++ b/lib/chef/node/attribute.rb @@ -545,7 +545,9 @@ class Chef safe_dup(component) end - components.inject(ImmutableMash.new) do |merged, component| + return nil if components.compact.empty? + + components.inject(ImmutableMash.new({})) do |merged, component| Chef::Mixin::DeepMerge.hash_only_merge!(merged, component) end end |