[Ocfs2-tools-commits] manish commits r659 - trunk/ocfs2console/ocfs2interface

[svn-commits at oss.oracle.com]

Author: manish
Date: 2005-03-17 21:20:33 -0600 (Thu, 17 Mar 2005)
New Revision: 659

Modified:
   trunk/ocfs2console/ocfs2interface/main.py
Log:
Hook in new fsck code


Modified: trunk/ocfs2console/ocfs2interface/main.py
===================================================================
--- trunk/ocfs2console/ocfs2interface/main.py	2005-03-18 03:16:52 UTC (rev 658)
+++ trunk/ocfs2console/ocfs2interface/main.py	2005-03-18 03:20:33 UTC (rev 659)
@@ -30,6 +30,7 @@
 from nodemap import NodeMap
 from browser import Browser
 from clconfig import cluster_configurator
+from fsck import fsck
 
 COLUMN_DEVICE = 0
 COLUMN_MOUNTPOINT = 1
@@ -68,16 +69,12 @@
         if store and iter:
             return store[iter]
         else:
-            return None
+            return (None, None)
 
     def get_device(self):
         selection = self.get_sel_values()
+        return selection[COLUMN_DEVICE]
 
-        if selection:
-            return selection[COLUMN_DEVICE]
-        else:
-            return None
-
     def on_select(self, sel):
         self.selected = True
 
@@ -204,10 +201,10 @@
     pv.refresh_partitions()
 
 def check(pv):
-    pass
+    fsck(pv.toplevel, pv.get_device(), check=True)
 
 def repair(pv):
-    pass
+    fsck(pv.toplevel, pv.get_device(), check=False)
 
 def clconfig(pv):
     cluster_configurator(pv.toplevel)
@@ -272,6 +269,8 @@
         notebook.add_with_properties(frame, 'tab_label', desc)
 
     pv.refresh_partitions()
+    pv.grab_focus()
+   
 
     window.show_all()