summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorBart Vanbrabant <bart.vanbrabant@zoeloelip.be>2008-01-22 16:29:38 +0100
committerBart Vanbrabant <bart.vanbrabant@zoeloelip.be>2008-01-22 16:29:38 +0100
commitb561ae64014630d9d2b93a6a6625fe67e9844c9e (patch)
tree29dc731030d217df337160e8310d9b0199d4ec17 /lib
parent89d5517f1b522b4e71a78409552b4756143be07d (diff)
downloadpuppet-b561ae64014630d9d2b93a6a6625fe67e9844c9e.tar.gz
puppet-b561ae64014630d9d2b93a6a6625fe67e9844c9e.tar.xz
puppet-b561ae64014630d9d2b93a6a6625fe67e9844c9e.zip
Fix bug #997, only evaluate non-virtual definitions
Diffstat (limited to 'lib')
-rw-r--r--lib/puppet/parser/compile.rb8
1 files changed, 6 insertions, 2 deletions
diff --git a/lib/puppet/parser/compile.rb b/lib/puppet/parser/compile.rb
index e1e230d48..3dc7d3657 100644
--- a/lib/puppet/parser/compile.rb
+++ b/lib/puppet/parser/compile.rb
@@ -285,11 +285,15 @@ class Puppet::Parser::Compile
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