diff options
Diffstat (limited to 'lib/puppet/util')
| -rw-r--r-- | lib/puppet/util/autoload.rb | 4 | ||||
| -rw-r--r-- | lib/puppet/util/feature.rb | 2 |
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] |