[Erp5-report] r14042 - /erp5/trunk/utils/oood/
nobody at svn.erp5.org
nobody at svn.erp5.org
Wed Apr 11 10:45:19 CEST 2007
Author: jerome
Date: Wed Apr 11 10:45:18 2007
New Revision: 14042
URL: http://svn.erp5.org?rev=14042&view=rev
Log:
remove all "sys.path.append('/etc/oood')" - it was impossible to run multiple
installations of oood. Instead, specify PYTHONPATH in startup script. The
default will be to use config.py from current directory.
Modified:
erp5/trunk/utils/oood/lib.py
erp5/trunk/utils/oood/logger.py
erp5/trunk/utils/oood/mimemapper.py
erp5/trunk/utils/oood/oood.rc
erp5/trunk/utils/oood/runserw.py
erp5/trunk/utils/oood/serw.py
erp5/trunk/utils/oood/start.py
erp5/trunk/utils/oood/testOoodBasicOperations.py
erp5/trunk/utils/oood/testOoodHighLoad.py
Modified: erp5/trunk/utils/oood/lib.py
URL: http://svn.erp5.org/erp5/trunk/utils/oood/lib.py?rev=14042&r1=14041&r2=14042&view=diff
==============================================================================
--- erp5/trunk/utils/oood/lib.py (original)
+++ erp5/trunk/utils/oood/lib.py Wed Apr 11 10:45:18 2007
@@ -31,9 +31,6 @@
import time
import string
import sys
-
-# Ad-hoc patch. Should be more generic
-sys.path.append('/etc/oood/')
import config
Modified: erp5/trunk/utils/oood/logger.py
URL: http://svn.erp5.org/erp5/trunk/utils/oood/logger.py?rev=14042&r1=14041&r2=14042&view=diff
==============================================================================
--- erp5/trunk/utils/oood/logger.py (original)
+++ erp5/trunk/utils/oood/logger.py Wed Apr 11 10:45:18 2007
@@ -3,7 +3,6 @@
import sys
import threading
import traceback
-sys.path.append('/etc/oood')
import config
Modified: erp5/trunk/utils/oood/mimemapper.py
URL: http://svn.erp5.org/erp5/trunk/utils/oood/mimemapper.py?rev=14042&r1=14041&r2=14042&view=diff
==============================================================================
--- erp5/trunk/utils/oood/mimemapper.py (original)
+++ erp5/trunk/utils/oood/mimemapper.py Wed Apr 11 10:45:18 2007
@@ -29,7 +29,6 @@
import operator
import sys
-sys.path.append('/etc/oood')
import config
from logger import Log
sys.path.append(config.uno_path)
Modified: erp5/trunk/utils/oood/oood.rc
URL: http://svn.erp5.org/erp5/trunk/utils/oood/oood.rc?rev=14042&r1=14041&r2=14042&view=diff
==============================================================================
--- erp5/trunk/utils/oood/oood.rc (original)
+++ erp5/trunk/utils/oood/oood.rc Wed Apr 11 10:45:18 2007
@@ -14,6 +14,11 @@
LOCKFILE=$RUNDIR/server_pid.lock
PIDFILE=$LOCKFILE
PYTHON=python
+
+# insert /etc/oood in python path, so that "import config" reads
+# /etc/oood/config.py
+PYTHONPATH=/etc/oood/:$PYTHONPATH
+export PYTHONPATH
start() {
if [ -f $LOCKFILE ] ; then
Modified: erp5/trunk/utils/oood/runserw.py
URL: http://svn.erp5.org/erp5/trunk/utils/oood/runserw.py?rev=14042&r1=14041&r2=14042&view=diff
==============================================================================
--- erp5/trunk/utils/oood/runserw.py (original)
+++ erp5/trunk/utils/oood/runserw.py Wed Apr 11 10:45:18 2007
@@ -102,7 +102,6 @@
#########################################################
## Use the lock/pid file to terminate the server.
#########################################################
- sys.path.append('/etc/oood/') # Big ad-hoc hack
import config
lock_file_path = os.path.join(config.run_dir, 'server_pid.lock')
# Get the server process id which is written in the lock file.
Modified: erp5/trunk/utils/oood/serw.py
URL: http://svn.erp5.org/erp5/trunk/utils/oood/serw.py?rev=14042&r1=14041&r2=14042&view=diff
==============================================================================
--- erp5/trunk/utils/oood/serw.py (original)
+++ erp5/trunk/utils/oood/serw.py Wed Apr 11 10:45:18 2007
@@ -27,9 +27,7 @@
#
##############################################################################
-# Ad-hoc patch. Should be more generic
import sys
-sys.path.append('/etc/oood/')
import base64
import cStringIO
Modified: erp5/trunk/utils/oood/start.py
URL: http://svn.erp5.org/erp5/trunk/utils/oood/start.py?rev=14042&r1=14041&r2=14042&view=diff
==============================================================================
--- erp5/trunk/utils/oood/start.py (original)
+++ erp5/trunk/utils/oood/start.py Wed Apr 11 10:45:18 2007
@@ -35,7 +35,6 @@
# Add oood home (= current path) as a place to look for import
# XXX Is this magical things make oood_home parameter useless in oood config file ?
sys.path.append(os.path.abspath(os.getcwd()))
-sys.path.append('/etc/oood')
# Standard python libs
import getopt, time, glob
@@ -179,6 +178,7 @@
"""
VIRTUAL_SCREEN = 0
XORG_TMP_PATH = "/tmp/.X11-unix"
+ # FIXME: is it really required to hardcode username here ?
OOOD_USER_NAME = "oood"
# Clean previous virtual display if found
killVirtualFrameBuffer()
@@ -197,7 +197,7 @@
, config.run_dir
))
Log.info("Pool - Virtual frame buffer started")
- Log.info("Pool - To see the virtual display, run 'xwud -in %sXvfb_screen%s'" % (config.run_dir, VIRTUAL_SCREEN))
+ Log.info("Pool - To see the virtual display, run 'xwud -in %s/Xvfb_screen%s'" % (config.run_dir, VIRTUAL_SCREEN))
def killVirtualFrameBuffer():
Modified: erp5/trunk/utils/oood/testOoodBasicOperations.py
URL: http://svn.erp5.org/erp5/trunk/utils/oood/testOoodBasicOperations.py?rev=14042&r1=14041&r2=14042&view=diff
==============================================================================
--- erp5/trunk/utils/oood/testOoodBasicOperations.py (original)
+++ erp5/trunk/utils/oood/testOoodBasicOperations.py Wed Apr 11 10:45:18 2007
@@ -34,7 +34,6 @@
import sys, base64, unittest
from xmlrpclib import *
-sys.path.append('/etc/oood')
import config
enc = base64.encodestring
Modified: erp5/trunk/utils/oood/testOoodHighLoad.py
URL: http://svn.erp5.org/erp5/trunk/utils/oood/testOoodHighLoad.py?rev=14042&r1=14041&r2=14042&view=diff
==============================================================================
--- erp5/trunk/utils/oood/testOoodHighLoad.py (original)
+++ erp5/trunk/utils/oood/testOoodHighLoad.py Wed Apr 11 10:45:18 2007
@@ -45,7 +45,6 @@
import unittest
from xmlrpclib import *
-sys.path.append('/etc/oood')
import config
import lib
More information about the Erp5-report
mailing list