summaryrefslogtreecommitdiffstats
path: root/lib/puppet/client.rb
diff options
context:
space:
mode:
Diffstat (limited to 'lib/puppet/client.rb')
-rw-r--r--lib/puppet/client.rb9
1 files changed, 8 insertions, 1 deletions
diff --git a/lib/puppet/client.rb b/lib/puppet/client.rb
index ece131b7b..56e78349a 100644
--- a/lib/puppet/client.rb
+++ b/lib/puppet/client.rb
@@ -274,7 +274,14 @@ module Puppet
transaction = container.evaluate
#transaction = Puppet::Transaction.new(objects)
transaction.toplevel = true
- transaction.evaluate
+ begin
+ transaction.evaluate
+ rescue Puppet::Error => detail
+ Puppet.err "Could not apply complete configuration: %s" %
+ detail
+ rescue => detail
+ Puppet.err "Found a bug: %s" % detail
+ end
Puppet::Metric.gather
Puppet::Metric.tally
if Puppet[:rrdgraph] == true