summaryrefslogtreecommitdiffstats
path: root/lib/puppet/parser/resource.rb
diff options
context:
space:
mode:
authorshadoi <shadoi@980ebf18-57e1-0310-9a29-db15c13687c0>2006-12-15 21:10:22 +0000
committershadoi <shadoi@980ebf18-57e1-0310-9a29-db15c13687c0>2006-12-15 21:10:22 +0000
commitf622e18eff86d7a65e47cb6fd3ac07cceb5b3ecb (patch)
tree94c98e6848e2cc419908af1993c63e08089300b3 /lib/puppet/parser/resource.rb
parent9ad62d24093563e947d846fa3771bcebf550b8ee (diff)
downloadpuppet-f622e18eff86d7a65e47cb6fd3ac07cceb5b3ecb.tar.gz
puppet-f622e18eff86d7a65e47cb6fd3ac07cceb5b3ecb.tar.xz
puppet-f622e18eff86d7a65e47cb6fd3ac07cceb5b3ecb.zip
Go back to restype and remove STI classes, they were more trouble than they were worth.
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@1940 980ebf18-57e1-0310-9a29-db15c13687c0
Diffstat (limited to 'lib/puppet/parser/resource.rb')
-rw-r--r--lib/puppet/parser/resource.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/puppet/parser/resource.rb b/lib/puppet/parser/resource.rb
index 0802dd882..7ea85dded 100644
--- a/lib/puppet/parser/resource.rb
+++ b/lib/puppet/parser/resource.rb
@@ -266,11 +266,11 @@ class Puppet::Parser::Resource
# 'type' isn't a valid column name, so we have to use something else.
args = symbolize_options(args)
- #args[:type] = args[:type]
- #args.delete(:type)
+ args[:restype] = args[:type]
+ args.delete(:type)
# Let's see if the object exists
- if obj = host.resources.find_by_type_and_title(self.type, self.title)
+ if obj = host.resources.find_by_restype_and_title(self.type, self.title)
# We exist
args.each do |param, value|
obj[param] = value