From 922cf1a8fc23b0cc341f5746d1c83b533b5761a8 Mon Sep 17 00:00:00 2001 From: Markus Roberts Date: Sat, 6 Feb 2010 11:34:16 -0800 Subject: Resolving conflicts with ??? class_scope was moved to scope. --- lib/puppet/resource/type.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/puppet') diff --git a/lib/puppet/resource/type.rb b/lib/puppet/resource/type.rb index e102cb0fd..1b78bf58b 100644 --- a/lib/puppet/resource/type.rb +++ b/lib/puppet/resource/type.rb @@ -226,7 +226,7 @@ class Puppet::Resource::Type end def parent_scope(scope, klass) - scope.compiler.class_scope(klass) || raise(Puppet::DevError, "Could not find scope for #{klass.name}") + scope.class_scope(klass) || raise(Puppet::DevError, "Could not find scope for #{klass.name}") end def set_name_and_namespace(name) -- cgit