diff options
| author | Martin Hellmich <mhellmic@gmail.com> | 2013-04-22 23:26:22 +0200 |
|---|---|---|
| committer | Martin Hellmich <mhellmic@gmail.com> | 2013-04-22 23:26:22 +0200 |
| commit | 3077d26b00b170ef2c5c808831577d421613b198 (patch) | |
| tree | 3a92cd65686c76f7bc81015591d1d8579d7b372f /lib/puppet/parser/functions/merge.rb | |
| parent | 89bceb2821d82c64434e6529de48ec7d7389a13e (diff) | |
check if an argument supposed to be merged is empty to
pass over undefs without failing
Diffstat (limited to 'lib/puppet/parser/functions/merge.rb')
| -rw-r--r-- | lib/puppet/parser/functions/merge.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/puppet/parser/functions/merge.rb b/lib/puppet/parser/functions/merge.rb index 6ec085e..54d1c1c 100644 --- a/lib/puppet/parser/functions/merge.rb +++ b/lib/puppet/parser/functions/merge.rb @@ -22,6 +22,7 @@ module Puppet::Parser::Functions accumulator = Hash.new # Merge into the accumulator hash args.each do |arg| + next if arg.empty? # empty string is synonym for puppet's undef unless arg.is_a?(Hash) raise Puppet::ParseError, "merge: unexpected argument type #{arg.class}, only expects hash arguments" end |