summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorLuke Kanies <luke@madstop.com>2008-01-19 11:45:09 -0800
committerLuke Kanies <luke@madstop.com>2008-01-19 11:45:09 -0800
commit9161ae8f215520cda16ba9345a8818de08b89ca0 (patch)
tree90eb1527281ede043ad6c71253fda6c3f7714c12 /lib
parent046a3269db6468f1f7a79b98f8738328b9992fb7 (diff)
downloadpuppet-9161ae8f215520cda16ba9345a8818de08b89ca0.tar.gz
puppet-9161ae8f215520cda16ba9345a8818de08b89ca0.tar.xz
puppet-9161ae8f215520cda16ba9345a8818de08b89ca0.zip
Applying a fix for #998 -- I used a patch equivalent to
bartv's, although I could not use his commit because it was against the 'master' branch instead of 0.24.x.
Diffstat (limited to 'lib')
-rw-r--r--lib/puppet/parser/compile.rb3
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/puppet/parser/compile.rb b/lib/puppet/parser/compile.rb
index f76103a28..e1e230d48 100644
--- a/lib/puppet/parser/compile.rb
+++ b/lib/puppet/parser/compile.rb
@@ -309,6 +309,9 @@ class Puppet::Parser::Compile
done = false if evaluate_collections
done = false if evaluate_definitions
break if done
+
+ count += 1
+
if count > 1000
raise Puppet::ParseError, "Somehow looped more than 1000 times while evaluating host catalog"
end