[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, upstream, updated. 0.25.5-639-g8f94f35

[test branch]

The following commit has been merged in the upstream branch:
commit 922cf1a8fc23b0cc341f5746d1c83b533b5761a8
Author: Markus Roberts <Markus at reality.com>
Date:   Sat Feb 6 11:34:16 2010 -0800

    Resolving conflicts with ???
    
    class_scope was moved to scope.

diff --git a/lib/puppet/resource/type.rb b/lib/puppet/resource/type.rb
index e102cb0..1b78bf5 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)

-- 
Puppet packaging for Debian