diff options
| -rw-r--r-- | lib/puppet/parser/functions.rb | 4 | ||||
| -rwxr-xr-x | test/language/functions.rb | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/lib/puppet/parser/functions.rb b/lib/puppet/parser/functions.rb index 569d70c52..31053596f 100644 --- a/lib/puppet/parser/functions.rb +++ b/lib/puppet/parser/functions.rb @@ -117,8 +117,8 @@ module Functions end newfunction(:fail, :statement) do |vals| - vals = vals.join(" ") if vals.is_a? Array - raise Puppet::ParseError, vals + vals = vals.collect { |s| s.to_s }.join(" ") if vals.is_a? Array + raise Puppet::ParseError, vals.to_s end end end diff --git a/test/language/functions.rb b/test/language/functions.rb index ca941c248..6b46bfd9e 100755 --- a/test/language/functions.rb +++ b/test/language/functions.rb @@ -76,7 +76,8 @@ class TestLangFunctions < Test::Unit::TestCase :name => "fail", :ftype => :statement, :arguments => AST::ASTArray.new( - :children => [stringobj("this is a failure")] + :children => [stringobj("this is a failure"), + stringobj("and another")] ) ) end |