From 35de0e3bd74e94de92ac0e9209a4884cf07c88a0 Mon Sep 17 00:00:00 2001 From: luke Date: Mon, 13 Nov 2006 07:49:48 +0000 Subject: Temporarily reverting all of the recent rails work so that I can release 0.20.1 git-svn-id: https://reductivelabs.com/svn/puppet/trunk@1873 980ebf18-57e1-0310-9a29-db15c13687c0 --- lib/puppet/parser/resource/param.rb | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'lib/puppet/parser/resource') diff --git a/lib/puppet/parser/resource/param.rb b/lib/puppet/parser/resource/param.rb index bcd59573a..600e44781 100644 --- a/lib/puppet/parser/resource/param.rb +++ b/lib/puppet/parser/resource/param.rb @@ -18,22 +18,20 @@ class Puppet::Parser::Resource::Param # Store this parameter in a Rails db. def store(resource) args = {} - #FIXME: re-add line/file support - #[:name, :value, :line, :file].each do |var| - [:name, :value ].each do |var| + [:name, :value, :line, :file].each do |var| if val = self.send(var) args[var] = val end end args[:name] = args[:name].to_s - if pname = resource.param_names.find_by_name(self.name) + if obj = resource.rails_parameters.find_by_name(self.name) # We exist args.each do |p, v| - pname.param_values.build(v) + obj[p] = v end else # Else create it anew - obj = resource.param_names.build(:name => self.class) + obj = resource.rails_parameters.build(args) end return obj -- cgit