diff options
| author | Jesse Wolfe <jes5199@gmail.com> | 2010-09-13 22:57:48 -0700 |
|---|---|---|
| committer | Jesse Wolfe <jes5199@gmail.com> | 2010-09-13 22:57:48 -0700 |
| commit | 754ed19a8105a1be01c723a91abf9999ec6a8ab3 (patch) | |
| tree | 8a3b59432ff56fbaf64d1cb6448e4e228f5359c0 /lib/puppet/agent.rb | |
| parent | 21afb51a1b84116b2a906a6959ae588f45135104 (diff) | |
| parent | efa834aaec596b0d5e7b314a53e6b258ce44728c (diff) | |
| download | puppet-754ed19a8105a1be01c723a91abf9999ec6a8ab3.tar.gz puppet-754ed19a8105a1be01c723a91abf9999ec6a8ab3.tar.xz puppet-754ed19a8105a1be01c723a91abf9999ec6a8ab3.zip | |
Merge commit '2.6.1rc4'
Diffstat (limited to 'lib/puppet/agent.rb')
| -rw-r--r-- | lib/puppet/agent.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/puppet/agent.rb b/lib/puppet/agent.rb index 52acc64aa..47dd44a0e 100644 --- a/lib/puppet/agent.rb +++ b/lib/puppet/agent.rb @@ -37,7 +37,9 @@ class Puppet::Agent with_client do |client| begin sync.synchronize { lock { result = client.run(*args) } } - rescue => detail + rescue SystemExit,NoMemoryError + raise + rescue Exception => detail puts detail.backtrace if Puppet[:trace] Puppet.err "Could not run #{client_class}: #{detail}" end |