From 24b11b59829fe773ec49db03bbf8b7ddcc0ef182 Mon Sep 17 00:00:00 2001 From: ballman Date: Fri, 11 May 2007 15:07:08 +0000 Subject: Removed acts_as_taggable from the rails stuff. I haven't removed the tables from the schema nor the indexes yet. git-svn-id: https://reductivelabs.com/svn/puppet/trunk@2505 980ebf18-57e1-0310-9a29-db15c13687c0 --- lib/puppet/parser/resource.rb | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'lib/puppet/parser') diff --git a/lib/puppet/parser/resource.rb b/lib/puppet/parser/resource.rb index d19b4ac1e..d00c8d50f 100644 --- a/lib/puppet/parser/resource.rb +++ b/lib/puppet/parser/resource.rb @@ -294,11 +294,9 @@ class Puppet::Parser::Resource resource = host.resources.build(args) end - # Handle file and tags specially - [:file, :tags].each do |param| - if self.send(param) and (!resource.send(param) or resource.send(param) != self.send(param)) - resource.send(param.to_s + "=", self.send(param)) - end + # Handle file specially + if self.file and (!resource.file or resource.file != self.file) + resource.file = self.file end # Either way, now add our parameters -- cgit