diff options
| author | Brice Figureau <brice-puppet@daysofwonder.com> | 2008-10-28 14:12:36 +0100 |
|---|---|---|
| committer | James Turnbull <james@lovedthanlost.net> | 2008-10-29 09:53:14 +1100 |
| commit | c7ccc4ba7c42d56595564491ae578a1604c628d1 (patch) | |
| tree | b624d8acd2ff2e7699b83963832fd27ddac23631 /lib/puppet/parser | |
| parent | c906afd9e36017bba339ca50998e1651e54dbd0c (diff) | |
| download | puppet-c7ccc4ba7c42d56595564491ae578a1604c628d1.tar.gz puppet-c7ccc4ba7c42d56595564491ae578a1604c628d1.tar.xz puppet-c7ccc4ba7c42d56595564491ae578a1604c628d1.zip | |
Fix #1682 - ASTArray should flatten product of evaluation of its children
If the ASTArray contains children that evaluate to arrays themselves,
they aren't flattened.
Diffstat (limited to 'lib/puppet/parser')
| -rw-r--r-- | lib/puppet/parser/ast/astarray.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/puppet/parser/ast/astarray.rb b/lib/puppet/parser/ast/astarray.rb index 8f09aa922..0fccbca75 100644 --- a/lib/puppet/parser/ast/astarray.rb +++ b/lib/puppet/parser/ast/astarray.rb @@ -30,10 +30,9 @@ class Puppet::Parser::AST items << child end } - rets = items.flatten.collect { |child| child.safeevaluate(scope) - } + }.flatten return rets.reject { |o| o.nil? } end |