From 0025e13792b6a8e010ce1fd1dc20a17e7ba8af53 Mon Sep 17 00:00:00 2001 From: Markus Roberts Date: Sun, 24 Jan 2010 18:32:25 -0800 Subject: 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. --- lib/puppet/network/xmlrpc/client.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/puppet/network/xmlrpc/client.rb') diff --git a/lib/puppet/network/xmlrpc/client.rb b/lib/puppet/network/xmlrpc/client.rb index 805d99324..9faa71c8b 100644 --- a/lib/puppet/network/xmlrpc/client.rb +++ b/lib/puppet/network/xmlrpc/client.rb @@ -144,7 +144,7 @@ module Puppet::Network Puppet.debug "Calling %s.%s" % [namespace, method] begin call("%s.%s" % [namespace, method.to_s],*args) - rescue SystemExit,NoMemoryError,SignalException,Interrupt + rescue SystemExit,NoMemoryError raise rescue Exception => detail retry if self.class.error_handler(detail).execute(self, detail, namespace, method) == :retry -- cgit