aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorshnavid <shnavid@ef72aa8b-4018-0410-8976-d6e080ef94d8>2007-06-15 11:03:15 +0000
committershnavid <shnavid@ef72aa8b-4018-0410-8976-d6e080ef94d8>2007-06-15 11:03:15 +0000
commita8757b16a7e23155884f5dd1f6b8dc680270e575 (patch)
treed9421f5668c85587e315814fa38b6826532968a4
parent4cd0f4ef8ed1b66afb438b9293101b5560a74c0d (diff)
downloadsos-a8757b16a7e23155884f5dd1f6b8dc680270e575.tar.gz
Exceptions in plugin.analyse() were not catched allowing a bad plugin to break sosreport.
git-svn-id: svn+ssh://svn.fedorahosted.org/svn/sos/trunk@142 ef72aa8b-4018-0410-8976-d6e080ef94d8
-rwxr-xr-xsrc/sosreport6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/sosreport b/src/sosreport
index 015d5e1b..119f319e 100755
--- a/src/sosreport
+++ b/src/sosreport
@@ -404,7 +404,11 @@ def sosreport():
# Call the analyze method for each plugin
for plugname, plug in loadedplugins:
soslog.log(logging.VERBOSE2, "Analyzing results of plugin %s" % plugname,)
- plug.analyze()
+ try:
+ plug.analyze()
+ except:
+ # catch exceptions in analyse() and keep working
+ pass
if __cmdLineOpts__.progressbar:
pbar.incAmount()
pbar.update()