summaryrefslogtreecommitdiffstats
path: root/lib/puppet/parser/interpreter.rb
diff options
context:
space:
mode:
authorBlake Barnett <bdb@bdb-debvm1.stanford.edu>2008-02-28 22:54:12 -0800
committerBlake Barnett <bdb@bdb-debvm1.stanford.edu>2008-02-28 22:54:12 -0800
commit5d3dd9e718cbe69b2fe7f37bc3ec422c88a1080b (patch)
tree787bf2a1a6833a2d7e1f5ae9f9d4e4dfdeb91139 /lib/puppet/parser/interpreter.rb
parent0139889be92add151e624710261ef6f8c0048586 (diff)
parent65b72676aef2d58314f546eb31780d1b9925b9b3 (diff)
downloadpuppet-5d3dd9e718cbe69b2fe7f37bc3ec422c88a1080b.tar.gz
puppet-5d3dd9e718cbe69b2fe7f37bc3ec422c88a1080b.tar.xz
puppet-5d3dd9e718cbe69b2fe7f37bc3ec422c88a1080b.zip
Merge branch '0.24.x' of git://reductivelabs.com/puppet into 0.24.x
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]