diff options
| author | Luke Kanies <luke@puppetlabs.com> | 2010-05-19 23:13:36 -0700 |
|---|---|---|
| committer | Markus Roberts <Markus@reality.com> | 2010-06-28 14:23:12 -0700 |
| commit | 2ab123f5a9ef045c0ea7acf109b5ea67fc9e5cf7 (patch) | |
| tree | f2f67cd73fbb09a28b5a7437720616c64a2e6ccd | |
| parent | 153d7cd69b8b5216695206cbc235dd89a65dec76 (diff) | |
| download | puppet-2ab123f5a9ef045c0ea7acf109b5ea67fc9e5cf7.tar.gz puppet-2ab123f5a9ef045c0ea7acf109b5ea67fc9e5cf7.tar.xz puppet-2ab123f5a9ef045c0ea7acf109b5ea67fc9e5cf7.zip | |
Removing obsolete nodescope concept
Signed-off-by: Luke Kanies <luke@puppetlabs.com>
| -rw-r--r-- | lib/puppet/resource/type.rb | 4 | ||||
| -rwxr-xr-x | spec/unit/resource/type_spec.rb | 6 |
2 files changed, 1 insertions, 9 deletions
diff --git a/lib/puppet/resource/type.rb b/lib/puppet/resource/type.rb index cb87cc44f..d9673ab04 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 044b81e41..ca9daf8c6 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) |