[svn] r5539 - trunk/tools/dstat

[packagers at lists.rpmforge.net]

Author: dag
Date: 2007-06-25 02:57:16 +0200 (Mon, 25 Jun 2007)
New Revision: 5539

Modified:
   trunk/tools/dstat/dstat
Log:
Corrected exception handling in module loading.

Modified: trunk/tools/dstat/dstat
===================================================================
--- trunk/tools/dstat/dstat	2007-06-24 19:56:58 UTC (rev 5538)
+++ trunk/tools/dstat/dstat	2007-06-25 00:57:16 UTC (rev 5539)
@@ -1808,8 +1808,8 @@
         else: mods = ( module, )
 
         for mod in mods:
-            if 'dstat_'+mod not in globals().keys():
-                try:
+            try:
+                if 'dstat_'+mod not in globals().keys():
                     import imp
                     file, pathname, description = imp.find_module('dstat_'+mod)
                     ### Try loading python plugin
@@ -1827,23 +1827,24 @@
 #                        print o.name
                     else:
                         info(1, 'Module is of unknown type.')
-                except Exception, e:
-                    info(1, 'Module %s failed to load. (%s)' % (mod, e))
-#                    tb = sys.exc_info()[2]
-                    continue
-
                 ### Remove defect stat objects and calculate line length
-                if not o.check():
-                    raise Exception, 'Unknown problem, please report'
+                    if not o.check():
+                        raise Exception, 'Unknown problem, please report'
 #                except Exception, e:
 #                    if mod == mods[-1]:
 #                        info(1, 'Module %s has problems. (%s)' % (mod, e))
 #                        if op.debug:
 #                            raise
 #                    continue
-            else:
-                exec 'o = dstat_%s()' % mod
-#            print o.__module__
+                else:
+                    exec 'o = dstat_%s()' % mod
+#                print o.__module__
+            except Exception, e:
+                info(1, 'Module %s failed to load. (%s)' % (mod, e))
+                if op.debug:
+                    raise
+#                tb = sys.exc_info()[2]
+                continue
 
             linewidth = linewidth + o.statwidth() + 1
             totlist.append(o)