diff options
| author | Paul Berry <paul@puppetlabs.com> | 2010-11-10 16:05:15 -0800 |
|---|---|---|
| committer | Paul Berry <paul@puppetlabs.com> | 2010-11-10 16:06:04 -0800 |
| commit | 2b8e834fcbc548a221b4cd02ee7200fa4f6c2c78 (patch) | |
| tree | d7c11657d0bfd44488b235c95819f62f7431b949 /lib/puppet/parser/compiler.rb | |
| parent | 7236a33d6c5c9fbb0f46ffd7826965dbaae6a39b (diff) | |
| parent | 275a224ee245577c4213b3a21bf1e98301740a4e (diff) | |
| download | puppet-2b8e834fcbc548a221b4cd02ee7200fa4f6c2c78.tar.gz puppet-2b8e834fcbc548a221b4cd02ee7200fa4f6c2c78.tar.xz puppet-2b8e834fcbc548a221b4cd02ee7200fa4f6c2c78.zip | |
Merge branch 'next'
This marks the end of the agile iteration from 11/3-11/10.
Diffstat (limited to 'lib/puppet/parser/compiler.rb')
| -rw-r--r-- | lib/puppet/parser/compiler.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/puppet/parser/compiler.rb b/lib/puppet/parser/compiler.rb index e1227e753..c60e1d4fb 100644 --- a/lib/puppet/parser/compiler.rb +++ b/lib/puppet/parser/compiler.rb @@ -144,7 +144,7 @@ class Puppet::Parser::Compiler if klass = scope.find_hostclass(name) found << name and next if scope.class_scope(klass) - resource = klass.mk_plain_resource(scope) + resource = klass.ensure_in_catalog(scope) # If they've disabled lazy evaluation (which the :include function does), # then evaluate our resource immediately. @@ -220,7 +220,7 @@ class Puppet::Parser::Compiler # Create a resource to model this node, and then add it to the list # of resources. - resource = astnode.mk_plain_resource(topscope) + resource = astnode.ensure_in_catalog(topscope) resource.evaluate |