summaryrefslogtreecommitdiffstats
path: root/lib/puppet/parser/interpreter.rb
diff options
context:
space:
mode:
authorLuke Kanies <luke@madstop.com>2008-02-28 16:12:48 -0600
committerLuke Kanies <luke@madstop.com>2008-02-28 16:12:48 -0600
commit9d6e926d8196294afe6b5a03c20a9035056575f1 (patch)
tree4cbabb985fcd560eae56c8c34a7f6819c778b23e /lib/puppet/parser/interpreter.rb
parent8df0c1ba76b3fab2ebafb3682a2364561ba6e82a (diff)
downloadpuppet-9d6e926d8196294afe6b5a03c20a9035056575f1.tar.gz
puppet-9d6e926d8196294afe6b5a03c20a9035056575f1.tar.xz
puppet-9d6e926d8196294afe6b5a03c20a9035056575f1.zip
Fixed #1063 -- the master correctly logs syntax errors when
reparsing during a single run.
Diffstat (limited to 'lib/puppet/parser/interpreter.rb')
-rw-r--r--lib/puppet/parser/interpreter.rb6
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/puppet/parser/interpreter.rb b/lib/puppet/parser/interpreter.rb
index d4655c403..f27c1c5c8 100644
--- a/lib/puppet/parser/interpreter.rb
+++ b/lib/puppet/parser/interpreter.rb
@@ -61,7 +61,11 @@ class Puppet::Parser::Interpreter
# If a parser already exists, than assume that we logged the
# exception elsewhere and reuse the parser. If one doesn't
# exist, then reraise.
- raise detail unless @parsers[environment]
+ if @parsers[environment]
+ Puppet.err detail
+ else
+ raise detail
+ end
end
end
@parsers[environment]