diff options
| author | James Turnbull <james@lovedthanlost.net> | 2008-02-13 20:29:00 +1100 |
|---|---|---|
| committer | James Turnbull <james@lovedthanlost.net> | 2008-02-13 20:29:00 +1100 |
| commit | d3959c497f4c61995f664d88aa3386b54c4baf8d (patch) | |
| tree | 1a83a85c0c6d626781cad5632db146aeae49d0c9 /lib/puppet/parser/resource.rb | |
| parent | c3ead0331adba5f60ea7d508775a89de68e26caa (diff) | |
| parent | bcb9b564281003e22d72752d84fa9dc9c8c7107b (diff) | |
| download | puppet-d3959c497f4c61995f664d88aa3386b54c4baf8d.tar.gz puppet-d3959c497f4c61995f664d88aa3386b54c4baf8d.tar.xz puppet-d3959c497f4c61995f664d88aa3386b54c4baf8d.zip | |
Merge branch '0.24.x' of git://reductivelabs.com/puppet into 0.24.x
Diffstat (limited to 'lib/puppet/parser/resource.rb')
| -rw-r--r-- | lib/puppet/parser/resource.rb | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/lib/puppet/parser/resource.rb b/lib/puppet/parser/resource.rb index 58667727f..fb0799011 100644 --- a/lib/puppet/parser/resource.rb +++ b/lib/puppet/parser/resource.rb @@ -58,8 +58,7 @@ class Puppet::Parser::Resource def evaluate if klass = @ref.definedtype finish() - scope.compile.delete_resource(self) - return klass.evaluate(:scope => scope, :resource => self) + return klass.evaluate_code(self) elsif builtin? devfail "Cannot evaluate a builtin type" else @@ -83,7 +82,6 @@ class Puppet::Parser::Resource # Do any finishing work on this object, called before evaluation or # before storage/translation. def finish - add_overrides() add_defaults() add_metaparams() add_scope_tags() @@ -342,19 +340,6 @@ class Puppet::Parser::Resource end end - # Add any overrides for this object. - def add_overrides - if overrides = scope.compile.resource_overrides(self) - overrides.each do |over| - self.merge(over) - end - - # Remove the overrides, so that the configuration knows there - # are none left. - overrides.clear - end - end - def add_scope_tags if scope_resource = scope.resource tag(*scope_resource.tags) |