catch exceptions even for copyStuff()

added missing files for sysreport.legacy


git-svn-id: svn+ssh://svn.fedorahosted.org/svn/sos/trunk@311 ef72aa8b-4018-0410-8976-d6e080ef94d8

1 files changed, 11 insertions, 7 deletions

diff --git a/src/sosreport b/src/sosreport
index 876c1df4..302373ae 100755
--- a/src/sosreport
+++ b/src/sosreport
@@ -606,13 +606,17 @@ Press ENTER to continue, or CTRL-C to quit.
     plugrunning = Semaphore(2)
     for plugname, plug in loadedplugins:
         soslog.log(logging.VERBOSE, "executing plugin %s" % plugname)
-        if not __cmdLineOpts__.nomultithread:
-            plug.copyStuff(threaded = True, semaphore = plugrunning)
-        else:
-            plug.copyStuff()    
-            if __cmdLineOpts__.progressbar:
-                pbar.incAmount(plug.eta_weight)
-                pbar.update()
+        try:
+            if not __cmdLineOpts__.nomultithread:
+                plug.copyStuff(threaded = True, semaphore = plugrunning)
+            else:
+                plug.copyStuff()    
+                if __cmdLineOpts__.progressbar:
+                    pbar.incAmount(plug.eta_weight)
+                    pbar.update()
+        except:
+            if __raisePlugins__:
+                raise
     del plugrunning
 
     # Wait for all the collection threads to exit