diff options
| author | Luke Kanies <luke@madstop.com> | 2008-02-12 17:37:51 -0600 |
|---|---|---|
| committer | Luke Kanies <luke@madstop.com> | 2008-02-12 17:37:51 -0600 |
| commit | da78d96cb139db0775e634b2fa4bd9c173752127 (patch) | |
| tree | 4139d3a2011baedb171a8307c4830c5ac3fe3625 /lib/puppet/parser/ast/astarray.rb | |
| parent | bee9aba2da453151a80c6e1f25f16bec3bfde8d2 (diff) | |
| parent | 3af6827875f4e02b47fe2293280ff9afe811485f (diff) | |
| download | puppet-da78d96cb139db0775e634b2fa4bd9c173752127.tar.gz puppet-da78d96cb139db0775e634b2fa4bd9c173752127.tar.xz puppet-da78d96cb139db0775e634b2fa4bd9c173752127.zip | |
Merge branch '0.24.x'
Conflicts:
CHANGELOG
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 |