summaryrefslogtreecommitdiffstats
path: root/lib/puppet
diff options
context:
space:
mode:
authorJesse Wolfe <jes5199@gmail.com>2010-06-23 15:47:19 -0700
committertest branch <puppet-dev@googlegroups.com>2010-02-17 06:50:53 -0800
commitc8ca19a4e7d48d5c45fd67efb981c1c3d3b80e5c (patch)
tree9358eb62e68f9db3e09f67156cb176cad9085a44 /lib/puppet
parent2a73b5d194a5237722840844588a03addedf2d4c (diff)
downloadpuppet-c8ca19a4e7d48d5c45fd67efb981c1c3d3b80e5c.tar.gz
puppet-c8ca19a4e7d48d5c45fd67efb981c1c3d3b80e5c.tar.xz
puppet-c8ca19a4e7d48d5c45fd67efb981c1c3d3b80e5c.zip
[#3674] Make sure that failing to load a feature isn't fatal
Diffstat (limited to 'lib/puppet')
-rw-r--r--lib/puppet/util/feature.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/puppet/util/feature.rb b/lib/puppet/util/feature.rb
index 6218eabf4..d5866927a 100644
--- a/lib/puppet/util/feature.rb
+++ b/lib/puppet/util/feature.rb
@@ -20,7 +20,7 @@ class Puppet::Util::Feature
if block_given?
begin
result = yield
- rescue => detail
+ rescue Exception => detail
warn "Failed to load feature test for %s: %s" % [name, detail]
result = false
end