From 6f229eea198d85fd1b37ccaaa3e8257c592707e7 Mon Sep 17 00:00:00 2001 From: Markus Roberts Date: Wed, 1 Sep 2010 15:21:08 -0700 Subject: Minimal fix for #4631 -- set implicit classes as in 0.25.x This is a minimal fix for #4631 by reversing one part of the refactor for #1903 commit 0d4fd60c7c143cc1f4e4b0f99f359c09cbfbf21e. It fixes the immediate issue (implicit classes not being added to resources) but leaves open several other questions which are defered to #4687. --- lib/puppet/parser/resource.rb | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'lib/puppet') diff --git a/lib/puppet/parser/resource.rb b/lib/puppet/parser/resource.rb index 8a5ae886c..e34f284fc 100644 --- a/lib/puppet/parser/resource.rb +++ b/lib/puppet/parser/resource.rb @@ -93,6 +93,7 @@ class Puppet::Parser::Resource < Puppet::Resource @finished = true add_defaults add_metaparams + add_scope_tags validate end @@ -259,6 +260,12 @@ class Puppet::Parser::Resource < Puppet::Resource end end + def add_scope_tags + if scope_resource = scope.resource + tag(*scope_resource.tags) + end + end + # Accept a parameter from an override. def override_parameter(param) # This can happen if the override is defining a new parameter, rather -- cgit