diff options
| author | Luke Kanies <luke@madstop.com> | 2008-09-23 22:31:55 -0500 |
|---|---|---|
| committer | Luke Kanies <luke@madstop.com> | 2008-09-23 22:31:55 -0500 |
| commit | 4aeabbbb2163684ff7064198c653cd60d46e5717 (patch) | |
| tree | 7c3593bde6b7f28f3e20444a576eb37338cced14 /lib/puppet/parser/ast | |
| parent | 5b9dd01326a61b9ae89ae978e29a8170f76deb5e (diff) | |
| parent | 8d5ded09b9c9c944695c015e6e95b10ccebd6fb5 (diff) | |
| download | puppet-4aeabbbb2163684ff7064198c653cd60d46e5717.tar.gz puppet-4aeabbbb2163684ff7064198c653cd60d46e5717.tar.xz puppet-4aeabbbb2163684ff7064198c653cd60d46e5717.zip | |
Merge branch '0.24.x'
Conflicts:
lib/puppet/metatype/container.rb
lib/puppet/metatype/instances.rb
lib/puppet/metatype/metaparams.rb
lib/puppet/metatype/relationships.rb
lib/puppet/metatype/schedules.rb
Diffstat (limited to 'lib/puppet/parser/ast')
| -rw-r--r-- | lib/puppet/parser/ast/vardef.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/puppet/parser/ast/vardef.rb b/lib/puppet/parser/ast/vardef.rb index ee79159d7..a3094ac6e 100644 --- a/lib/puppet/parser/ast/vardef.rb +++ b/lib/puppet/parser/ast/vardef.rb @@ -3,7 +3,7 @@ require 'puppet/parser/ast/branch' class Puppet::Parser::AST # Define a variable. Stores the value in the current scope. class VarDef < AST::Branch - attr_accessor :name, :value + attr_accessor :name, :value, :append @settor = true @@ -14,7 +14,7 @@ class Puppet::Parser::AST value = @value.safeevaluate(scope) parsewrap do - scope.setvar(name,value, @file, @line) + scope.setvar(name,value, @file, @line, @append) end end |