From f496005bf3db8a5202bf9c16daf9a524b178c67a Mon Sep 17 00:00:00 2001 From: Martin Hellmich Date: Wed, 8 May 2013 17:14:28 +0200 Subject: fix in merge.rb: refine the checking if an argument is an empty string --- lib/puppet/parser/functions/merge.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/puppet/parser/functions/merge.rb') 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 -- cgit v1.2.3