diff options
| author | James Turnbull <james@lovedthanlost.net> | 2008-02-13 20:29:00 +1100 |
|---|---|---|
| committer | James Turnbull <james@lovedthanlost.net> | 2008-02-13 20:29:00 +1100 |
| commit | d3959c497f4c61995f664d88aa3386b54c4baf8d (patch) | |
| tree | 1a83a85c0c6d626781cad5632db146aeae49d0c9 /lib/puppet/parser/ast/astarray.rb | |
| parent | c3ead0331adba5f60ea7d508775a89de68e26caa (diff) | |
| parent | bcb9b564281003e22d72752d84fa9dc9c8c7107b (diff) | |
| download | puppet-d3959c497f4c61995f664d88aa3386b54c4baf8d.tar.gz puppet-d3959c497f4c61995f664d88aa3386b54c4baf8d.tar.xz puppet-d3959c497f4c61995f664d88aa3386b54c4baf8d.zip | |
Merge branch '0.24.x' of git://reductivelabs.com/puppet into 0.24.x
Diffstat (limited to 'lib/puppet/parser/ast/astarray.rb')
| -rw-r--r-- | lib/puppet/parser/ast/astarray.rb | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/puppet/parser/ast/astarray.rb b/lib/puppet/parser/ast/astarray.rb index 5f1e838d0..b66fd6bba 100644 --- a/lib/puppet/parser/ast/astarray.rb +++ b/lib/puppet/parser/ast/astarray.rb @@ -15,8 +15,7 @@ class Puppet::Parser::AST end # Evaluate our children. - def evaluate(hash) - scope = hash[:scope] + def evaluate(scope) rets = nil # We basically always operate declaratively, and when we # do we need to evaluate the settor-like statements first. This @@ -51,7 +50,7 @@ class Puppet::Parser::AST } rets = [settors, others].flatten.collect { |child| - child.safeevaluate(:scope => scope) + child.safeevaluate(scope) } return rets.reject { |o| o.nil? } end |