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, 2 insertions, 2 deletions

diff --git a/lib/puppet/indirector/facts/facter.rb b/lib/puppet/indirector/facts/facter.rb
index 2caeeede2..b5787ddf6 100644
--- a/lib/puppet/indirector/facts/facter.rb
+++ b/lib/puppet/indirector/facts/facter.rb
@@ -29,7 +29,7 @@ class Puppet::Node::Facts::Facter < Puppet::Indirector::Code
                     Timeout::timeout(self.timeout) do
                         load file
                     end
-                rescue SystemExit,NoMemoryError,SignalException,Interrupt
+                rescue SystemExit,NoMemoryError
                     raise
                 rescue Exception => detail
                     Puppet.warning "Could not load fact file %s: %s" % [fqfile, detail]
diff --git a/lib/puppet/indirector/ldap.rb b/lib/puppet/indirector/ldap.rb
index 31ee0e020..ab3c7ef54 100644
--- a/lib/puppet/indirector/ldap.rb
+++ b/lib/puppet/indirector/ldap.rb
@@ -40,7 +40,7 @@ class Puppet::Indirector::Ldap < Puppet::Indirector::Terminus
                 found = true
                 yield entry
             end
-        rescue SystemExit,NoMemoryError,SignalException,Interrupt
+        rescue SystemExit,NoMemoryError
             raise
         rescue Exception => detail
             if count == 0