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

[svn-commits at oss.oracle.com]

Author: manish
Date: 2005-05-02 17:03:52 -0500 (Mon, 02 May 2005)
New Revision: 873

Modified:
   trunk/ocfs2console/ocfs2interface/menu.py
   trunk/ocfs2console/ocfs2interface/pushconfig.py
Log:
pushconfig should only be in the menu if vte is available


Modified: trunk/ocfs2console/ocfs2interface/menu.py
===================================================================
--- trunk/ocfs2console/ocfs2interface/menu.py	2005-04-30 03:12:24 UTC (rev 872)
+++ trunk/ocfs2console/ocfs2interface/menu.py	2005-05-02 22:03:52 UTC (rev 873)
@@ -20,6 +20,7 @@
 from guiutil import make_callback
 
 from fsck import fsck_ok
+from pushconfig import pushconfig_ok
 
 UNMOUNTED_ONLY = 42
 NEED_SELECTION = 43
@@ -41,12 +42,20 @@
      stock_about)
 )
 
-cluster_menu_data = (
+if pushconfig_ok:
+    cluster_menu_push_config_data = (
+        ('/Cluster/_Propagate Configuration...', None,       'push_config'),
+    )
+else:
+    cluster_menu_push_config_data = ()
+
+cluster_menu_head_data = (
     ('/_Cluster',                            None,       None,  0, '<Branch>'),
-    ('/Cluster/_Configure Nodes...',         None,       'node_config'),
-    ('/Cluster/_Propagate Configuration...', None,       'push_config')
+    ('/Cluster/_Configure Nodes...',         None,       'node_config')
 )
 
+cluster_menu_data = cluster_menu_head_data + cluster_menu_push_config_data
+
 if fsck_ok:
     task_menu_fsck_data = (
         ('/Tasks/Chec_k...',       '<control>K', 'check',    'refresh',

Modified: trunk/ocfs2console/ocfs2interface/pushconfig.py
===================================================================
--- trunk/ocfs2console/ocfs2interface/pushconfig.py	2005-04-30 03:12:24 UTC (rev 872)
+++ trunk/ocfs2console/ocfs2interface/pushconfig.py	2005-05-02 22:03:52 UTC (rev 873)
@@ -23,7 +23,7 @@
 
 from guiutil import error_box
 
-from terminal import TerminalDialog, terminal_ok as push_config_ok
+from terminal import TerminalDialog, terminal_ok as pushconfig_ok
 
 CONFIG_FILE = '/etc/ocfs2/cluster.conf'