summaryrefslogtreecommitdiffstats
path: root/lib/puppet/parser/compiler.rb
diff options
context:
space:
mode:
authorLuke Kanies <luke@madstop.com>2008-02-12 14:43:33 -0600
committerLuke Kanies <luke@madstop.com>2008-02-12 14:43:33 -0600
commit9b66251076e0403afde5b1ad7aa543d18e302a94 (patch)
treee2fdec852dda9dc47a44dcba90dfdcea36c408e9 /lib/puppet/parser/compiler.rb
parentc8da318a2a4445e0ce10c76a7fbb64635b291ccd (diff)
parentb561ae64014630d9d2b93a6a6625fe67e9844c9e (diff)
downloadpuppet-9b66251076e0403afde5b1ad7aa543d18e302a94.tar.gz
puppet-9b66251076e0403afde5b1ad7aa543d18e302a94.tar.xz
puppet-9b66251076e0403afde5b1ad7aa543d18e302a94.zip
Merge commit 'bartv/pending/fix-997' into 0.24.x
Diffstat (limited to 'lib/puppet/parser/compiler.rb')
-rw-r--r--lib/puppet/parser/compiler.rb8
1 files changed, 6 insertions, 2 deletions
diff --git a/lib/puppet/parser/compiler.rb b/lib/puppet/parser/compiler.rb
index 68c06e500..132ec15db 100644
--- a/lib/puppet/parser/compiler.rb
+++ b/lib/puppet/parser/compiler.rb
@@ -266,11 +266,15 @@ class Puppet::Parser::Compiler
def evaluate_definitions
exceptwrap do
if ary = unevaluated_resources
+ evaluated = false
ary.each do |resource|
- resource.evaluate
+ if not resource.virtual?
+ resource.evaluate
+ evaluated = true
+ end
end
# If we evaluated, let the loop know.
- return true
+ return evaluated
else
return false
end