diff options
Diffstat (limited to 'lib/puppet/parser/resource.rb')
| -rw-r--r-- | lib/puppet/parser/resource.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/puppet/parser/resource.rb b/lib/puppet/parser/resource.rb index 18ec15ac0..371f56ec1 100644 --- a/lib/puppet/parser/resource.rb +++ b/lib/puppet/parser/resource.rb @@ -72,12 +72,15 @@ class Puppet::Parser::Resource # Add any overrides for this object. def addoverrides - overrides = scope.lookupoverrides(self) + overrides = scope.configuration.resource_overrides(self) + raise "fix this test" overrides.each do |over| self.merge(over) end + # Remove the overrides, so that the configuration knows there + # are none left. overrides.clear end |