From f35c59f83b8df2e595ec44a6258dbae30c81237e Mon Sep 17 00:00:00 2001 From: Brice Figureau Date: Sun, 25 Apr 2010 17:52:37 +0200 Subject: Fix #3667 - Fix class namespace Class namespace is different than namespace of nodes and definition as it contains the whole qualified name. This bit was left out in the type are not AST anymore refactoring. Signed-off-by: Brice Figureau --- lib/puppet/resource/type.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'lib/puppet') diff --git a/lib/puppet/resource/type.rb b/lib/puppet/resource/type.rb index e60f87953..ab57f962f 100644 --- a/lib/puppet/resource/type.rb +++ b/lib/puppet/resource/type.rb @@ -289,7 +289,11 @@ class Puppet::Resource::Type @namespace = "" else @name = name.to_s.downcase - @namespace, ignored_shortname = namesplit(@name) + + # Note we're doing something somewhat weird here -- we're setting + # the class's namespace to its fully qualified name. This means + # anything inside that class starts looking in that namespace first. + @namespace, ignored_shortname = @type == :hostclass ? [@name, ''] : namesplit(@name) end end -- cgit