diff options
| -rw-r--r-- | lib/puppet/parser/ast/vardef.rb | 2 | ||||
| -rw-r--r-- | lib/puppet/parser/scope.rb | 11 |
2 files changed, 10 insertions, 3 deletions
diff --git a/lib/puppet/parser/ast/vardef.rb b/lib/puppet/parser/ast/vardef.rb index 6093952d4..ecc10bd14 100644 --- a/lib/puppet/parser/ast/vardef.rb +++ b/lib/puppet/parser/ast/vardef.rb @@ -15,7 +15,7 @@ class Puppet::Parser::AST value = @value.safeevaluate(:scope => scope) parsewrap do - scope.setvar(name,value) + scope.setvar(name,value, @file, @line) end end diff --git a/lib/puppet/parser/scope.rb b/lib/puppet/parser/scope.rb index 6b6e31373..bf4f7215e 100644 --- a/lib/puppet/parser/scope.rb +++ b/lib/puppet/parser/scope.rb @@ -519,12 +519,19 @@ class Puppet::Parser::Scope # Set a variable in the current scope. This will override settings # in scopes above, but will not allow variables in the current scope # to be reassigned if we're declarative (which is the default). - def setvar(name,value) + def setvar(name,value, file = nil, line = nil) #Puppet.debug "Setting %s to '%s' at level %s" % # [name.inspect,value,self.level] if @symtable.include?(name) if @@declarative - raise Puppet::ParseError, "Cannot reassign variable %s" % name + error = Puppet::ParseError.new("Cannot reassign variable %s" % name) + if file + error.file = file + end + if line + error.line = line + end + raise error else Puppet.warning "Reassigning %s to %s" % [name,value] end |