diff options
| author | Brice Figureau <brice-puppet@daysofwonder.com> | 2009-01-30 20:12:50 +0100 |
|---|---|---|
| committer | James Turnbull <james@lovedthanlost.net> | 2009-02-11 08:51:58 +1100 |
| commit | 7e036eb761539d58794469ecf14ee7e94d10a5fc (patch) | |
| tree | 6bb6e3c2cfee04a44f23084a4dbce93c99be91a2 /lib/puppet/parser/ast | |
| parent | 535fa89af0b87f1d514d75040c1da7795d1dc87e (diff) | |
| download | puppet-7e036eb761539d58794469ecf14ee7e94d10a5fc.tar.gz puppet-7e036eb761539d58794469ecf14ee7e94d10a5fc.tar.xz puppet-7e036eb761539d58794469ecf14ee7e94d10a5fc.zip | |
Fix #1922 - Functions squash all arguments into a single hash
Revert "Fix #1682 - ASTArray should flatten product of evaluation of its children"
This reverts commit c7ccc4ba7c42d56595564491ae578a1604c628d1.
Bug #1824 and #1922 proved the fix for #1682 and #1691 was wrong.
Signed-off-by: Brice Figureau <brice-puppet@daysofwonder.com>
Diffstat (limited to 'lib/puppet/parser/ast')
| -rw-r--r-- | lib/puppet/parser/ast/astarray.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/puppet/parser/ast/astarray.rb b/lib/puppet/parser/ast/astarray.rb index 0fccbca75..8f09aa922 100644 --- a/lib/puppet/parser/ast/astarray.rb +++ b/lib/puppet/parser/ast/astarray.rb @@ -30,9 +30,10 @@ class Puppet::Parser::AST items << child end } + rets = items.flatten.collect { |child| child.safeevaluate(scope) - }.flatten + } return rets.reject { |o| o.nil? } end |