diff options
| author | Brice Figureau <brice-puppet@daysofwonder.com> | 2010-04-24 13:47:00 +0200 |
|---|---|---|
| committer | Markus Roberts <Markus@reality.com> | 2010-06-28 14:17:56 -0700 |
| commit | 770a8ea2beb58cff52f5e532a777d7046aa2efb0 (patch) | |
| tree | 3bd0448cf17e075e48322e245389d556278d84d9 /lib/puppet/resource | |
| parent | 76953d818892506ec4cb3ab2c4dd7048364a08cd (diff) | |
| download | puppet-770a8ea2beb58cff52f5e532a777d7046aa2efb0.tar.gz puppet-770a8ea2beb58cff52f5e532a777d7046aa2efb0.tar.xz puppet-770a8ea2beb58cff52f5e532a777d7046aa2efb0.zip | |
Fix #3665 - main class shouldn't be a subscope of itself
During the refactoring of AST hostclass/node to non AST objects, we lost
the fact that the main class already comes with a scope (ie the top one),
so when we evaluate its code we shouldn't create a subscope for it.
Signed-off-by: Brice Figureau <brice-puppet@daysofwonder.com>
Diffstat (limited to 'lib/puppet/resource')
| -rw-r--r-- | lib/puppet/resource/type.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/puppet/resource/type.rb b/lib/puppet/resource/type.rb index ab57f962f..825cce39e 100644 --- a/lib/puppet/resource/type.rb +++ b/lib/puppet/resource/type.rb @@ -69,7 +69,7 @@ class Puppet::Resource::Type scope = tmp end - scope = subscope(scope, resource) + scope = subscope(scope, resource) unless resource.title == :main set_resource_parameters(resource, scope) |