diff options
| author | James Turnbull <james@lovedthanlost.net> | 2009-04-06 11:45:23 +1000 |
|---|---|---|
| committer | James Turnbull <james@lovedthanlost.net> | 2009-04-06 11:45:23 +1000 |
| commit | 3aedfd8bbcefcdb92af57e4661a360be9aee2716 (patch) | |
| tree | f44e6bd75fca39f2fd6c87e5d0b6e84ee14dd8e0 /lib/puppet/parser/ast | |
| parent | 173b5f0a162d8dd7f72e1cab257069bc65382960 (diff) | |
| parent | a677e26eb1452c08d7724047a18e50f4a654d2cd (diff) | |
| download | puppet-3aedfd8bbcefcdb92af57e4661a360be9aee2716.tar.gz puppet-3aedfd8bbcefcdb92af57e4661a360be9aee2716.tar.xz puppet-3aedfd8bbcefcdb92af57e4661a360be9aee2716.zip | |
Merge branch 'master' of git://reductivelabs.com/puppet
Diffstat (limited to 'lib/puppet/parser/ast')
| -rw-r--r-- | lib/puppet/parser/ast/leaf.rb | 2 | ||||
| -rw-r--r-- | lib/puppet/parser/ast/resource_override.rb | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/puppet/parser/ast/leaf.rb b/lib/puppet/parser/ast/leaf.rb index c545c1e47..dba9812a7 100644 --- a/lib/puppet/parser/ast/leaf.rb +++ b/lib/puppet/parser/ast/leaf.rb @@ -36,7 +36,7 @@ class Puppet::Parser::AST # Interpolate the string looking for variables, and then return # the result. def evaluate(scope) - return scope.strinterp(@value, @file, @line) + return scope.strinterp(@value, file, line) end end diff --git a/lib/puppet/parser/ast/resource_override.rb b/lib/puppet/parser/ast/resource_override.rb index 5c4a2410f..f8cf3a81e 100644 --- a/lib/puppet/parser/ast/resource_override.rb +++ b/lib/puppet/parser/ast/resource_override.rb @@ -40,8 +40,8 @@ class Puppet::Parser::AST :type => r.type, :title => r.title, :params => params, - :file => @file, - :line => @line, + :file => file, + :line => line, :source => scope.source, :scope => scope ) |