diff options
| author | Jesse Wolfe <jes5199@gmail.com> | 2010-12-10 14:46:30 -0800 |
|---|---|---|
| committer | Jesse Wolfe <jes5199@gmail.com> | 2010-12-10 14:46:30 -0800 |
| commit | 56c91fb2accc7c6e53ab8d3c0c60812674c1676a (patch) | |
| tree | c57aef9866dfcc8f4c5b31b596e8c4f0ef7a3493 /lib/puppet | |
| parent | 5c8489be9c3ee62c14b524a6d0d4a96dca5b9764 (diff) | |
| parent | 54a1025da96aed794e64080e58a7473afccef5b2 (diff) | |
Merge branch 'maint/2.6.next/fix-silent-mocha-failures' into 2.6.next
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 |