From: Martin Hellmich <mhellmic@gmail.com>
Date: Wed, 8 May 2013 15:14:28 +0000 (+0200)
Subject: fix in merge.rb: refine the checking if an argument is an empty string
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=f496005bf3db8a5202bf9c16daf9a524b178c67a;p=puppet-stdlib.git

fix in merge.rb: refine the checking if an argument is an empty string
---

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