Author: dmeyer
Date: Wed Apr 12 17:19:26 2006
New Revision: 8147
Modified:
trunk/WIP/webserver/bin/freevo-webserver2
trunk/apps/bin/freevo-autoshutdown
trunk/apps/bin/freevo-epg
trunk/tvdev/bin/freevo-tvdev
trunk/tvserver/bin/freevo-tvserver
trunk/webserver/bin/freevo-webserver
Log:
remove script dir from path (it uses the freevo script as module)
Modified: trunk/WIP/webserver/bin/freevo-webserver2
==============================================================================
--- trunk/WIP/webserver/bin/freevo-webserver2 (original)
+++ trunk/WIP/webserver/bin/freevo-webserver2 Wed Apr 12 17:19:26 2006
@@ -9,6 +9,10 @@
if not __site__ in sys.path:
sys.path.insert(0, __site__)
+# fix possible path problems (it crashes on some python installations)
+if os.path.dirname(__file__) in sys.path:
+ sys.path.remove(os.path.dirname(__file__))
+
# kaa imports
import kaa.cherrypy
Modified: trunk/apps/bin/freevo-autoshutdown
==============================================================================
--- trunk/apps/bin/freevo-autoshutdown (original)
+++ trunk/apps/bin/freevo-autoshutdown Wed Apr 12 17:19:26 2006
@@ -73,6 +73,10 @@
if not __site__ in sys.path:
sys.path.insert(0, __site__)
+# fix possible path problems (it crashes on some python installations)
+if os.path.dirname(__file__) in sys.path:
+ sys.path.remove(os.path.dirname(__file__))
+
# kaa imports
import kaa.notifier
Modified: trunk/apps/bin/freevo-epg
==============================================================================
--- trunk/apps/bin/freevo-epg (original)
+++ trunk/apps/bin/freevo-epg Wed Apr 12 17:19:26 2006
@@ -46,6 +46,10 @@
if not __site__ in sys.path:
sys.path.insert(0, __site__)
+# fix possible path problems (it crashes on some python installations)
+if os.path.dirname(__file__) in sys.path:
+ sys.path.remove(os.path.dirname(__file__))
+
# kaa imports
import kaa
import kaa.notifier
Modified: trunk/tvdev/bin/freevo-tvdev
==============================================================================
--- trunk/tvdev/bin/freevo-tvdev (original)
+++ trunk/tvdev/bin/freevo-tvdev Wed Apr 12 17:19:26 2006
@@ -13,6 +13,10 @@
if not __site__ in sys.path:
sys.path.insert(0, __site__)
+# fix possible path problems (it crashes on some python installations)
+if os.path.dirname(__file__) in sys.path:
+ sys.path.remove(os.path.dirname(__file__))
+
import kaa
# FIXME: we only need to import this because we need i18n and logging
Modified: trunk/tvserver/bin/freevo-tvserver
==============================================================================
--- trunk/tvserver/bin/freevo-tvserver (original)
+++ trunk/tvserver/bin/freevo-tvserver Wed Apr 12 17:19:26 2006
@@ -43,6 +43,10 @@
if not __site__ in sys.path:
sys.path.insert(0, __site__)
+# fix possible path problems (it crashes on some python installations)
+if os.path.dirname(__file__) in sys.path:
+ sys.path.remove(os.path.dirname(__file__))
+
pid = -1
if len(sys.argv) == 1:
# Normal recordserver startup, fork epg client. We can not import kaa
before
Modified: trunk/webserver/bin/freevo-webserver
==============================================================================
--- trunk/webserver/bin/freevo-webserver (original)
+++ trunk/webserver/bin/freevo-webserver Wed Apr 12 17:19:26 2006
@@ -43,6 +43,10 @@
if not __site__ in sys.path:
sys.path.insert(0, __site__)
+# fix possible path problems (it crashes on some python installations)
+if os.path.dirname(__file__) in sys.path:
+ sys.path.remove(os.path.dirname(__file__))
+
# get logging object
log = logging.getLogger('www')
-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
