diff options
| author | Markus Roberts <Markus@reality.com> | 2010-01-21 16:03:26 -0800 |
|---|---|---|
| committer | James Turnbull <james@lovedthanlost.net> | 2010-01-24 07:29:49 +1100 |
| commit | a91c476387887baa5920f5539a7c4acfaf8cecd9 (patch) | |
| tree | f60946f17d929bf7037ec4dd5102e3e04878913a /lib/puppet/ssl | |
| parent | 1a263e27dede28d3844a4f010ab6ce42ef2977b0 (diff) | |
| download | puppet-a91c476387887baa5920f5539a7c4acfaf8cecd9.tar.gz puppet-a91c476387887baa5920f5539a7c4acfaf8cecd9.tar.xz puppet-a91c476387887baa5920f5539a7c4acfaf8cecd9.zip | |
Fix for #3088 (catching Exception also traps SystemExit)
Changing rescues from the default to Exception (to catch errors that don't
descend from StandardError) had the unintended consequence of catching (and
suppressing) SystemExit.
This patch restores the behavior of by reraising the exception.
Of the other exceptions that fall through the same crack (NoMemoryError,
SignalException, LoadError, Interrupt, NotImplementedError, and ScriptError)
this patch also reraises NoMemoryError, SignalException, and Interrupt in the
same way and leaves the rest captured.
Diffstat (limited to 'lib/puppet/ssl')
| -rw-r--r-- | lib/puppet/ssl/host.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/puppet/ssl/host.rb b/lib/puppet/ssl/host.rb index 75e51e5c8..d6bbc4e5d 100644 --- a/lib/puppet/ssl/host.rb +++ b/lib/puppet/ssl/host.rb @@ -220,6 +220,8 @@ class Puppet::SSL::Host return if certificate generate return if certificate + rescue SystemExit,NoMemoryError,SignalException,Interrupt + raise rescue Exception => detail Puppet.err "Could not request certificate: %s" % detail.to_s if time < 1 |