[Erp5-report] r11560 - /erp5/trunk/utils/oood/start.py

[nobody at svn.erp5.org]

Author: kevin
Date: Thu Nov 30 18:45:06 2006
New Revision: 11560

URL: http://svn.erp5.org?rev=11560&view=rev
Log:
It make no sense to try to remove the file... It's better to let the user do it itself.

Modified:
    erp5/trunk/utils/oood/start.py

Modified: erp5/trunk/utils/oood/start.py
URL: http://svn.erp5.org/erp5/trunk/utils/oood/start.py?rev=11560&r1=11559&r2=11560&view=diff
==============================================================================
--- erp5/trunk/utils/oood/start.py (original)
+++ erp5/trunk/utils/oood/start.py Thu Nov 30 18:45:06 2006
@@ -162,8 +162,8 @@
   if os.path.exists(xorg_socket) and \
     (os.stat(xorg_socket).st_uid != int(getoutput("id -u %s" % OOOD_USER_NAME)) or \
      os.stat(xorg_socket).st_gid != int(getoutput("id -g %s" % OOOD_USER_NAME))):
-    os.remove(xorg_socket)
-    lib.log("Pool - '%s' removed because of bad permissions", 0)
+    lib.log("Pool - Can't start Virtual Frame Buffer because '%s' is not owned by %s" % (xorg_socket, OOOD_USER_NAME), 3)
+    sys.exit(1)
   # Start the new virtual display server
   os.system("Xvfb -ac :%s -screen %s 800x600x16 -fbdir %s &" % ( config.virtual_display_id
                                                                , VIRTUAL_SCREEN