diff options
| author | Martin Hellmich <mhellmic@gmail.com> | 2013-05-08 17:14:28 +0200 |
|---|---|---|
| committer | Martin Hellmich <mhellmic@gmail.com> | 2013-05-08 18:24:07 +0200 |
| commit | f496005bf3db8a5202bf9c16daf9a524b178c67a (patch) | |
| tree | b17d75b01a8c8b07ab21448852954ec151e799d6 /lib/puppet/parser/functions/merge.rb | |
| parent | 3077d26b00b170ef2c5c808831577d421613b198 (diff) | |
| download | puppet-stdlib-f496005bf3db8a5202bf9c16daf9a524b178c67a.tar.gz puppet-stdlib-f496005bf3db8a5202bf9c16daf9a524b178c67a.tar.bz2 | |
fix in merge.rb: refine the checking if an argument is an empty string
Diffstat (limited to 'lib/puppet/parser/functions/merge.rb')
| -rw-r--r-- | lib/puppet/parser/functions/merge.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/puppet/parser/functions/merge.rb b/lib/puppet/parser/functions/merge.rb index 54d1c1c..1b39f20 100644 --- a/lib/puppet/parser/functions/merge.rb +++ b/lib/puppet/parser/functions/merge.rb @@ -22,7 +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 + next if arg.is_a? String and 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 |