diff options
| author | Markus Roberts <Markus@reality.com> | 2010-02-06 11:34:16 -0800 |
|---|---|---|
| committer | test branch <puppet-dev@googlegroups.com> | 2010-02-17 06:50:53 -0800 |
| commit | 922cf1a8fc23b0cc341f5746d1c83b533b5761a8 (patch) | |
| tree | 983f535b88e8da916ad8711e279ef7d2ae441d55 /lib/puppet | |
| parent | 0d704686b923c7827b9fe16f20d4f8722c125d88 (diff) | |
| download | puppet-922cf1a8fc23b0cc341f5746d1c83b533b5761a8.tar.gz puppet-922cf1a8fc23b0cc341f5746d1c83b533b5761a8.tar.xz puppet-922cf1a8fc23b0cc341f5746d1c83b533b5761a8.zip | |
Resolving conflicts with ???
class_scope was moved to scope.
Diffstat (limited to 'lib/puppet')
| -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 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) |