[Ocfs2-tools-commits] manish commits r621 - in trunk/ocfs2console: . ocfs2interface

[svn-commits at oss.oracle.com]

Author: manish
Date: 2005-01-27 19:58:30 -0600 (Thu, 27 Jan 2005)
New Revision: 621

Modified:
   trunk/ocfs2console/ocfs2console
   trunk/ocfs2console/ocfs2interface/about.py
   trunk/ocfs2console/ocfs2interface/main.py
Log:
Allow gtk library command line args through


Modified: trunk/ocfs2console/ocfs2console
===================================================================
--- trunk/ocfs2console/ocfs2console	2005-01-28 01:58:05 UTC (rev 620)
+++ trunk/ocfs2console/ocfs2console	2005-01-28 01:58:30 UTC (rev 621)
@@ -3,8 +3,8 @@
 # XXX: for production
 #!/usr/bin/python -W ignore::DeprecationWarning
 
-from ocfs2interface.about import process_info_args
-process_info_args()
+from ocfs2interface.about import process_args
+process_args()
 
 try:
     import gtk

Modified: trunk/ocfs2console/ocfs2interface/about.py
===================================================================
--- trunk/ocfs2console/ocfs2interface/about.py	2005-01-28 01:58:05 UTC (rev 620)
+++ trunk/ocfs2console/ocfs2interface/about.py	2005-01-28 01:58:30 UTC (rev 621)
@@ -15,6 +15,8 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 021110-1307, USA.
 
+import sys
+
 OCFS2TOOL_VERSION = '0.0.2'
 
 def print_version():
@@ -26,9 +28,7 @@
   -V, --version  print version information and exit
       --help     display this help and exit''' % name
 
-def process_info_args():
-    import sys
-
+def process_args():
     for arg in sys.argv[1:]:
         if arg == '--version' or arg == '-V':
             print_version()
@@ -36,10 +36,12 @@
         elif arg == '--help':
             print_usage(sys.argv[0])
             sys.exit(0)
-        else:
-            print_usage(sys.argv[0])
-            sys.exit(1)
 
+def process_gui_args():
+    if len(sys.argv) > 1:
+        print_usage(sys.argv[0])
+        sys.exit(1)
+        
 def about(pv):
     import gtk
 

Modified: trunk/ocfs2console/ocfs2interface/main.py
===================================================================
--- trunk/ocfs2console/ocfs2interface/main.py	2005-01-28 01:58:05 UTC (rev 620)
+++ trunk/ocfs2console/ocfs2interface/main.py	2005-01-28 01:58:30 UTC (rev 621)
@@ -23,7 +23,7 @@
 
 from menu import Menu
 from toolbar import Toolbar
-from about import about
+from about import about, process_gui_args
 from process import Process
 from format import format_partition
 from general import General
@@ -270,6 +270,7 @@
     window.show_all()
 
 def main():
+    process_gui_args()
     create_window()
     gtk.main()