diff options
| author | Markus Roberts <Markus@reality.com> | 2010-01-24 18:32:25 -0800 |
|---|---|---|
| committer | Markus Roberts <Markus@reality.com> | 2010-01-24 18:32:25 -0800 |
| commit | 0025e13792b6a8e010ce1fd1dc20a17e7ba8af53 (patch) | |
| tree | 5715206a2db5717adb7077ff786541906b8fde28 /lib/puppet/configurer | |
| parent | bfc9e45309abd182aac99a7dbf8960540fc05bf6 (diff) | |
| download | puppet-0025e13792b6a8e010ce1fd1dc20a17e7ba8af53.tar.gz puppet-0025e13792b6a8e010ce1fd1dc20a17e7ba8af53.tar.xz puppet-0025e13792b6a8e010ce1fd1dc20a17e7ba8af53.zip | |
Partial reversion of patch for #3088 to fix #3104 (Exception misreported)
In my patch for #3088 I made a erroneous assumption about the ruby exception
hierarchy and thus missed the fact that Timeout::error descends from both
SignalError and Interrupt. This is a partial reversion of the patch for #3088
to let these through so that more useful error messages can be produced.
Diffstat (limited to 'lib/puppet/configurer')
| -rw-r--r-- | lib/puppet/configurer/fact_handler.rb | 2 | ||||
| -rw-r--r-- | lib/puppet/configurer/plugin_handler.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/puppet/configurer/fact_handler.rb b/lib/puppet/configurer/fact_handler.rb index a05d89060..72bd76e1f 100644 --- a/lib/puppet/configurer/fact_handler.rb +++ b/lib/puppet/configurer/fact_handler.rb @@ -17,7 +17,7 @@ module Puppet::Configurer::FactHandler begin reload_facter() Puppet::Node::Facts.find(Puppet[:certname]) - rescue SystemExit,NoMemoryError,SignalException,Interrupt + rescue SystemExit,NoMemoryError raise rescue Exception => detail puts detail.backtrace if Puppet[:trace] diff --git a/lib/puppet/configurer/plugin_handler.rb b/lib/puppet/configurer/plugin_handler.rb index 856942176..9e1c113f9 100644 --- a/lib/puppet/configurer/plugin_handler.rb +++ b/lib/puppet/configurer/plugin_handler.rb @@ -19,7 +19,7 @@ module Puppet::Configurer::PluginHandler begin Puppet.info "Loading downloaded plugin %s" % file load file - rescue SystemExit,NoMemoryError,SignalException,Interrupt + rescue SystemExit,NoMemoryError raise rescue Exception => detail Puppet.err "Could not load downloaded file %s: %s" % [file, detail] |