diff options
| author | Jesse Wolfe <jes5199@gmail.com> | 2010-12-10 12:46:15 -0800 |
|---|---|---|
| committer | Jesse Wolfe <jes5199@gmail.com> | 2010-12-10 14:27:25 -0800 |
| commit | 8c134b697d2c30128f51cd69e47808a051b96b72 (patch) | |
| tree | 3f0f34169873fcef79d4570309b079024d1fbcc2 /lib/puppet | |
| parent | 5c8489be9c3ee62c14b524a6d0d4a96dca5b9764 (diff) | |
| download | puppet-8c134b697d2c30128f51cd69e47808a051b96b72.tar.gz puppet-8c134b697d2c30128f51cd69e47808a051b96b72.tar.xz puppet-8c134b697d2c30128f51cd69e47808a051b96b72.zip | |
maint: broken test not failing due to over-eager exception catching
A test was not testing what it claimed, but the failure exception was
getting swallowed by an unnecessarily broad rescue match.
Paired-With: Nick Lewis <nick@puppetlabs.com>
Diffstat (limited to 'lib/puppet')
| -rw-r--r-- | lib/puppet/configurer/plugin_handler.rb | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/lib/puppet/configurer/plugin_handler.rb b/lib/puppet/configurer/plugin_handler.rb index 539441e75..8192d4719 100644 --- a/lib/puppet/configurer/plugin_handler.rb +++ b/lib/puppet/configurer/plugin_handler.rb @@ -19,9 +19,7 @@ module Puppet::Configurer::PluginHandler begin Puppet.info "Loading downloaded plugin #{file}" load file - rescue SystemExit,NoMemoryError - raise - rescue Exception => detail + rescue StandardError, LoadError => detail Puppet.err "Could not load downloaded file #{file}: #{detail}" end end |