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/ifstatement.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/ifstatement.rb')
| -rw-r--r-- | lib/puppet/parser/ast/ifstatement.rb | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/lib/puppet/parser/ast/ifstatement.rb b/lib/puppet/parser/ast/ifstatement.rb index 66a07b01f..afa2cd572 100644 --- a/lib/puppet/parser/ast/ifstatement.rb +++ b/lib/puppet/parser/ast/ifstatement.rb @@ -12,15 +12,14 @@ class Puppet::Parser::AST # Short-curcuit evaluation. If we're true, evaluate our statements, # else if there's an 'else' setting, evaluate it. # the first option that matches. - def evaluate(hash) - scope = hash[:scope] - value = @test.safeevaluate(:scope => scope) + def evaluate(scope) + value = @test.safeevaluate(scope) if Puppet::Parser::Scope.true?(value) - return @statements.safeevaluate(:scope => scope) + return @statements.safeevaluate(scope) else if defined? @else - return @else.safeevaluate(:scope => scope) + return @else.safeevaluate(scope) else return nil end |