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

[Markus Roberts]

The following commit has been merged in the upstream branch:
commit 2ab123f5a9ef045c0ea7acf109b5ea67fc9e5cf7
Author: Luke Kanies <luke at puppetlabs.com>
Date:   Wed May 19 23:13:36 2010 -0700

    Removing obsolete nodescope concept
    
    Signed-off-by: Luke Kanies <luke at puppetlabs.com>

diff --git a/lib/puppet/resource/type.rb b/lib/puppet/resource/type.rb
index cb87cc4..d9673ab 100644
--- a/lib/puppet/resource/type.rb
+++ b/lib/puppet/resource/type.rb
@@ -224,9 +224,7 @@ class Puppet::Resource::Type
 
     # Create a new subscope in which to evaluate our code.
     def subscope(scope, resource)
-        scope = scope.newscope :resource => resource, :namespace => self.namespace, :source => self
-        scope.nodescope = true if @type == :node
-        scope
+        scope.newscope :resource => resource, :namespace => self.namespace, :source => self
     end
 
     # Check whether a given argument is valid.
diff --git a/spec/unit/resource/type_spec.rb b/spec/unit/resource/type_spec.rb
index 044b81e..ca9daf8 100755
--- a/spec/unit/resource/type_spec.rb
+++ b/spec/unit/resource/type_spec.rb
@@ -518,12 +518,6 @@ describe Puppet::Resource::Type do
                 @type.evaluate_code(@resource)
             end
 
-            it "should use a nodescope subscope" do
-                @type.evaluate_code(@resource)
-
-                @scope.class_scope(@type).nodescope.should be_true
-            end
-
             it "should use the parent's scope as its base scope" do
                 @type.evaluate_code(@resource)
 

-- 
Puppet packaging for Debian