summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorJesse Wolfe <jes5199@gmail.com>2009-10-26 00:43:29 -0700
committerJames Turnbull <james@lovedthanlost.net>2009-10-27 10:35:02 +1100
commit73d04c6b15e1b626cd7dea1f963a5ca02a810137 (patch)
tree981addbae93abc82a2998975ea49003b72d8afec /lib
parent7517572949e4e0efc419f97cf2663588af8b9756 (diff)
downloadpuppet-73d04c6b15e1b626cd7dea1f963a5ca02a810137.tar.gz
puppet-73d04c6b15e1b626cd7dea1f963a5ca02a810137.tar.xz
puppet-73d04c6b15e1b626cd7dea1f963a5ca02a810137.zip
Bug #2534 Raise error if property appears twice
This patch changes Puppet::Parser::Resource to check if it has been passed two Puppet::Parser::Resource::Param objects with the same name. Signed-off-by: Jesse Wolfe <jes5199@gmail.com>
Diffstat (limited to 'lib')
-rw-r--r--lib/puppet/parser/resource.rb6
1 files changed, 6 insertions, 0 deletions
diff --git a/lib/puppet/parser/resource.rb b/lib/puppet/parser/resource.rb
index b8aaf2715..651ed4224 100644
--- a/lib/puppet/parser/resource.rb
+++ b/lib/puppet/parser/resource.rb
@@ -139,6 +139,12 @@ class Puppet::Parser::Resource
if params = options[:params]
options.delete(:params)
params.each do |param|
+ # Don't set the same parameter twice
+ if @params[param.name]
+ self.fail Puppet::ParseError, "Duplicate parameter '%s' for on %s" %
+ [param.name, self.to_s]
+ end
+
set_parameter(param)
end
end