From 7e036eb761539d58794469ecf14ee7e94d10a5fc Mon Sep 17 00:00:00 2001
From: Brice Figureau <brice-puppet@daysofwonder.com>
Date: Fri, 30 Jan 2009 20:12:50 +0100
Subject: 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>
---
 lib/puppet/parser/ast/astarray.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'lib/puppet')

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