diff options
| author | Jesse Wolfe <jes5199@gmail.com> | 2010-10-02 01:14:03 -0700 |
|---|---|---|
| committer | Jesse Wolfe <jes5199@gmail.com> | 2010-10-02 01:14:17 -0700 |
| commit | ce9a6f97ab1784d8bd60eae8b60272c9875b1f84 (patch) | |
| tree | ba2e2fe2d56b813e93133683bab006abf28d6cc5 /lib/puppet/parser/ast/function.rb | |
| parent | c6e824ad5144957e351892a1d745a127b02f34b3 (diff) | |
| parent | 8cd1540f82cbdf903c164bdbc2c7229e34a4178b (diff) | |
| download | puppet-ce9a6f97ab1784d8bd60eae8b60272c9875b1f84.tar.gz puppet-ce9a6f97ab1784d8bd60eae8b60272c9875b1f84.tar.xz puppet-ce9a6f97ab1784d8bd60eae8b60272c9875b1f84.zip | |
Partial merge to 2.6.2rc1 : Merge commit '8cd1540' into next
There are merge conflicts with commits following this one.
Diffstat (limited to 'lib/puppet/parser/ast/function.rb')
| -rw-r--r-- | lib/puppet/parser/ast/function.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/puppet/parser/ast/function.rb b/lib/puppet/parser/ast/function.rb index 74023f631..80e6e6512 100644 --- a/lib/puppet/parser/ast/function.rb +++ b/lib/puppet/parser/ast/function.rb @@ -28,7 +28,7 @@ class Puppet::Parser::AST end # We don't need to evaluate the name, because it's plaintext - args = @arguments.safeevaluate(scope) + args = @arguments.safeevaluate(scope).map { |x| x == :undef ? '' : x } scope.send("function_#{@name}", args) end |