diff options
| author | Jesse Wolfe <jes5199@gmail.com> | 2010-12-13 13:43:22 -0800 |
|---|---|---|
| committer | Jesse Wolfe <jes5199@gmail.com> | 2010-12-13 13:43:22 -0800 |
| commit | dcccdc1d7f31b92f73c9a106960a373a009c1a5b (patch) | |
| tree | 5e124ae26c27cf6a70d9b32b65bdc28348180716 /lib | |
| parent | 6e997e819f315d2868de9f3de8ab95c7f6ce8d51 (diff) | |
| parent | 3ac50fab81216789d6d5f7d22cb675d3264674cd (diff) | |
| download | puppet-dcccdc1d7f31b92f73c9a106960a373a009c1a5b.tar.gz puppet-dcccdc1d7f31b92f73c9a106960a373a009c1a5b.tar.xz puppet-dcccdc1d7f31b92f73c9a106960a373a009c1a5b.zip | |
Merge branch 'maint/2.6.next/safe-pluginhandler' into 2.6.next
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/puppet/configurer/plugin_handler.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/puppet/configurer/plugin_handler.rb b/lib/puppet/configurer/plugin_handler.rb index 8192d4719..cfc6b5a0b 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 #{file}" load file - rescue StandardError, LoadError => detail + rescue Exception => detail Puppet.err "Could not load downloaded file #{file}: #{detail}" end end |