diff options
| author | Markus Roberts <Markus@reality.com> | 2010-01-24 18:32:25 -0800 |
|---|---|---|
| committer | Markus Roberts <Markus@reality.com> | 2010-01-24 18:32:25 -0800 |
| commit | 0025e13792b6a8e010ce1fd1dc20a17e7ba8af53 (patch) | |
| tree | 5715206a2db5717adb7077ff786541906b8fde28 /lib/puppet/util/autoload.rb | |
| parent | bfc9e45309abd182aac99a7dbf8960540fc05bf6 (diff) | |
| download | puppet-0025e13792b6a8e010ce1fd1dc20a17e7ba8af53.tar.gz puppet-0025e13792b6a8e010ce1fd1dc20a17e7ba8af53.tar.xz puppet-0025e13792b6a8e010ce1fd1dc20a17e7ba8af53.zip | |
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.
Diffstat (limited to 'lib/puppet/util/autoload.rb')
| -rw-r--r-- | lib/puppet/util/autoload.rb | 4 |
1 files changed, 2 insertions, 2 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] |