summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Turnbull <james@lovedthanlost.net>2008-02-25 11:51:06 +1100
committerJames Turnbull <james@lovedthanlost.net>2008-02-25 11:51:06 +1100
commitc8b320e36652db5dac02870ecc73a62c70d5c736 (patch)
tree086c39b3c6dd3d212d9f875ad8c425e785e73c1a
parent07cd482863dbfd396d9b2c19df67d103e111287d (diff)
downloadpuppet-c8b320e36652db5dac02870ecc73a62c70d5c736.tar.gz
puppet-c8b320e36652db5dac02870ecc73a62c70d5c736.tar.xz
puppet-c8b320e36652db5dac02870ecc73a62c70d5c736.zip
Corrected #1040 fix - this should now be right - trace was after raise
-rw-r--r--lib/puppet/parser/interpreter.rb4
1 files changed, 1 insertions, 3 deletions
diff --git a/lib/puppet/parser/interpreter.rb b/lib/puppet/parser/interpreter.rb
index 33f66e8c2..d4655c403 100644
--- a/lib/puppet/parser/interpreter.rb
+++ b/lib/puppet/parser/interpreter.rb
@@ -28,10 +28,8 @@ class Puppet::Parser::Interpreter
begin
return Puppet::Parser::Compiler.new(node, env_parser).compile
rescue => detail
+ puts detail.backtrace if Puppet[:trace]
raise Puppet::Error, detail.to_s + " on node %s" % node.name
- if Puppet[:trace]
- puts detail.backtrace
- end
end
end