diff options
author | luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0> | 2007-07-10 15:31:19 +0000 |
---|---|---|
committer | luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0> | 2007-07-10 15:31:19 +0000 |
commit | 7a71db875d8833065dbefdaf721f74a65414478c (patch) | |
tree | 12afcec70d8e6d88cde02f20186a39b05842c663 /lib/puppet/parser/resource.rb | |
parent | e662c869bf8b2924c12d4ff6f999f0744779257d (diff) | |
download | puppet-7a71db875d8833065dbefdaf721f74a65414478c.tar.gz puppet-7a71db875d8833065dbefdaf721f74a65414478c.tar.xz puppet-7a71db875d8833065dbefdaf721f74a65414478c.zip |
Adding patch by Valentin Vidic to add the "+>" syntax for adding values to parameters
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@2670 980ebf18-57e1-0310-9a29-db15c13687c0
Diffstat (limited to 'lib/puppet/parser/resource.rb')
-rw-r--r-- | lib/puppet/parser/resource.rb | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/lib/puppet/parser/resource.rb b/lib/puppet/parser/resource.rb index 56b430b7f..ccb88d69a 100644 --- a/lib/puppet/parser/resource.rb +++ b/lib/puppet/parser/resource.rb @@ -265,6 +265,11 @@ class Puppet::Parser::Resource if current = @params[param.name] # XXX Should we ignore any settings that have the same values? if param.source.child_of?(current.source) + if param.add + # Merge with previous value. + param.value = [ current.value, param.value ].flatten + end + # Replace it, keeping all of its info. @params[param.name] = param else |