opuppet/puppetlabs-stdlib
4
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

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

Browse source
This commit is contained in:
Martin Hellmich 2013-05-08 17:14:28 +02:00
parent 3077d26b00
commit f496005bf3
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/puppet/parser/functions/merge.rb
View file

@ -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