diff options
| author | Jesse Wolfe <jes5199@gmail.com> | 2010-07-27 10:17:44 -0700 |
|---|---|---|
| committer | Jesse Wolfe <jes5199@gmail.com> | 2010-07-27 10:17:44 -0700 |
| commit | b53e7d78e2e87571ae53170e9716b9ccd75da6e2 (patch) | |
| tree | 58489a37bd0ee14b3d053a0e23f9638b4f6205e7 /lib/puppet/parser/resource.rb | |
| parent | 94edd404130b4236f0c65a579857e3a25c5ee17f (diff) | |
| parent | ecf44e4408c168893d74af58a4c7c8606634a844 (diff) | |
| download | puppet-b53e7d78e2e87571ae53170e9716b9ccd75da6e2.tar.gz puppet-b53e7d78e2e87571ae53170e9716b9ccd75da6e2.tar.xz puppet-b53e7d78e2e87571ae53170e9716b9ccd75da6e2.zip | |
Merge commit '2.6.1rc1' into next
Diffstat (limited to 'lib/puppet/parser/resource.rb')
| -rw-r--r-- | lib/puppet/parser/resource.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/puppet/parser/resource.rb b/lib/puppet/parser/resource.rb index c956a1106..3c451929e 100644 --- a/lib/puppet/parser/resource.rb +++ b/lib/puppet/parser/resource.rb @@ -64,6 +64,7 @@ class Puppet::Parser::Resource < Puppet::Resource # Retrieve the associated definition and evaluate it. def evaluate + @evaluated = true if klass = resource_type and ! builtin_type? finish return klass.evaluate_code(self) @@ -72,8 +73,6 @@ class Puppet::Parser::Resource < Puppet::Resource else self.fail "Cannot find definition #{type}" end - ensure - @evaluated = true end # Mark this resource as both exported and virtual, |