diff options
| author | Luke Kanies <luke@madstop.com> | 2008-05-20 10:19:10 -0500 |
|---|---|---|
| committer | Luke Kanies <luke@madstop.com> | 2008-05-20 10:19:10 -0500 |
| commit | fe157f239a301abb52f81c62719355c8e50c970c (patch) | |
| tree | 2ff683d14dbf5c95a99410fe1d12300368cf497e /lib/puppet/parser/interpreter.rb | |
| parent | 3cb0d60d3d0870f1d9ac83e5dbeaa06d2888231f (diff) | |
| parent | 84a787a2a764a5035f7cbb8d30f94fc601bed154 (diff) | |
| download | puppet-fe157f239a301abb52f81c62719355c8e50c970c.tar.gz puppet-fe157f239a301abb52f81c62719355c8e50c970c.tar.xz puppet-fe157f239a301abb52f81c62719355c8e50c970c.zip | |
Merge branch '0.24.x'
Conflicts:
CHANGELOG
spec/integration/defaults.rb
spec/integration/node/catalog.rb
spec/unit/rails.rb
spec/unit/type/mount.rb
Diffstat (limited to 'lib/puppet/parser/interpreter.rb')
| -rw-r--r-- | lib/puppet/parser/interpreter.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/puppet/parser/interpreter.rb b/lib/puppet/parser/interpreter.rb index f27c1c5c8..04ca41494 100644 --- a/lib/puppet/parser/interpreter.rb +++ b/lib/puppet/parser/interpreter.rb @@ -62,7 +62,7 @@ class Puppet::Parser::Interpreter # exception elsewhere and reuse the parser. If one doesn't # exist, then reraise. if @parsers[environment] - Puppet.err detail + Puppet.err(detail.to_s + "; using previously parsed manifests") else raise detail end |