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.

2 files changed, 3 insertions, 3 deletions

diff --git a/lib/puppet/util/autoload.rb b/lib/puppet/util/autoload.rb
index 142ff293f..51fdaadad 100644
--- a/lib/puppet/util/autoload.rb
+++ b/lib/puppet/util/autoload.rb
@@ -86,7 +86,7 @@ class Puppet::Util::Autoload
                 name = symbolize(name)
                 loaded name, file
                 return true
-            rescue SystemExit,NoMemoryError,SignalException,Interrupt
+            rescue SystemExit,NoMemoryError
                 raise
             rescue Exception => detail
                 # I have no idea what's going on here, but different versions
@@ -125,7 +125,7 @@ class Puppet::Util::Autoload
                 begin
                     Kernel.require file
                     loaded(name, file)
-                rescue SystemExit,NoMemoryError,SignalException,Interrupt
+                rescue SystemExit,NoMemoryError
                     raise
                 rescue Exception => detail
                     if Puppet[:trace]
diff --git a/lib/puppet/util/feature.rb b/lib/puppet/util/feature.rb
index 8f77a2724..6218eabf4 100644
--- a/lib/puppet/util/feature.rb
+++ b/lib/puppet/util/feature.rb
@@ -83,7 +83,7 @@ class Puppet::Util::Feature
 
         begin
             require lib
-        rescue SystemExit,NoMemoryError,SignalException,Interrupt
+        rescue SystemExit,NoMemoryError
             raise
         rescue Exception
             Puppet.debug "Failed to load library '%s' for feature '%s'" % [lib, name]