[Ocfs2-tools-commits] manish commits r588 - trunk/ocfs2console

svn-commits at oss.oracle.com svn-commits at oss.oracle.com
Tue Jan 25 21:32:01 CST 2005


Author: manish
Date: 2005-01-25 21:31:58 -0600 (Tue, 25 Jan 2005)
New Revision: 588

Added:
   trunk/ocfs2console/run
Removed:
   trunk/ocfs2console/ocfs2console
Log:
Rename wrapper to run, in preparation for module directory


Deleted: trunk/ocfs2console/ocfs2console
===================================================================
--- trunk/ocfs2console/ocfs2console	2005-01-26 03:05:31 UTC (rev 587)
+++ trunk/ocfs2console/ocfs2console	2005-01-26 03:31:58 UTC (rev 588)
@@ -1,10 +0,0 @@
-#!/usr/bin/python
-
-# XXX: for production
-#!/usr/bin/python -W ignore::DeprecationWarning
-
-from ocfs2console.about import process_info_args
-process_info_args()
-
-from ocfs2console.interface import main
-main()

Copied: trunk/ocfs2console/run (from rev 587, trunk/ocfs2console/ocfs2console)
===================================================================
--- trunk/ocfs2console/ocfs2console	2005-01-26 03:05:31 UTC (rev 587)
+++ trunk/ocfs2console/run	2005-01-26 03:31:58 UTC (rev 588)
@@ -0,0 +1,17 @@
+#!/usr/bin/python
+
+# XXX: for production
+#!/usr/bin/python -W ignore::DeprecationWarning
+
+from ocfs2console.about import process_info_args
+process_info_args()
+
+try:
+    import gtk
+except RuntimeError:
+    import sys
+    print >>sys.stderr, 'ocfs2console needs an X11 display'
+    sys.exit(1)
+
+from ocfs2console.interface import main
+main()



More information about the Ocfs2-tools-commits mailing list