You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
79 lines
3.6 KiB
79 lines
3.6 KiB
diff -Naur mediaproxy.orig/mediaproxy.py mediaproxy/mediaproxy.py |
|
--- mediaproxy.orig/mediaproxy.py 2006-08-08 00:27:44.646994832 +0200 |
|
+++ mediaproxy/mediaproxy.py 2006-08-08 00:29:02.761119680 +0200 |
|
@@ -11,7 +11,7 @@ |
|
|
|
## add the modules subdir to the import search path |
|
import sys, os |
|
-sys.path[1:1] = [os.path.realpath((os.path.dirname(sys.argv[0]) or '.') + '/modules')] |
|
+sys.path[1:1] = [os.path.realpath(sys.prefix + '/lib/python/site-packages/mediaproxy/modules')] |
|
del os |
|
|
|
if __name__ == '__main__': |
|
diff -Naur mediaproxy.orig/proxydispatcher.py mediaproxy/proxydispatcher.py |
|
--- mediaproxy.orig/proxydispatcher.py 2006-08-08 00:27:44.647994680 +0200 |
|
+++ mediaproxy/proxydispatcher.py 2006-08-08 00:29:32.494599504 +0200 |
|
@@ -22,7 +22,7 @@ |
|
|
|
## add the modules subdir to the import search path |
|
import sys, os |
|
-sys.path[1:1] = [os.path.realpath((os.path.dirname(sys.argv[0]) or '.') + '/modules')] |
|
+sys.path[1:1] = [os.path.realpath(sys.prefix + '/lib/python/site-packages/mediaproxy/modules')] |
|
del os |
|
|
|
|
|
diff -Naur mediaproxy.orig/sessions.py mediaproxy/sessions.py |
|
--- mediaproxy.orig/sessions.py 2006-08-08 00:27:44.648994528 +0200 |
|
+++ mediaproxy/sessions.py 2006-08-08 00:30:14.248251984 +0200 |
|
@@ -4,7 +4,7 @@ |
|
|
|
## add the modules subdir to the import search path |
|
import sys, os |
|
-sys.path[1:1] = [os.path.realpath((os.path.dirname(sys.argv[0]) or '.') + '/modules')] |
|
+sys.path[1:1] = [os.path.realpath(sys.prefix + '/lib/python/site-packages/mediaproxy/modules')] |
|
del os |
|
|
|
|
|
diff -Naur mediaproxy.orig/utils/fakeconversations.py mediaproxy/utils/fakeconversations.py |
|
--- mediaproxy.orig/utils/fakeconversations.py 2006-08-08 00:27:44.648994528 +0200 |
|
+++ mediaproxy/utils/fakeconversations.py 2006-08-08 00:31:02.576904912 +0200 |
|
@@ -153,8 +153,8 @@ |
|
|
|
|
|
if __name__ == '__main__': |
|
- sys.path[1:1] = [os.path.realpath((os.path.dirname(sys.argv[0]) or '.') + '/../')] |
|
- sys.path[1:1] = [os.path.realpath((os.path.dirname(sys.argv[0]) or '.') + '/../modules')] |
|
+ sys.path[1:1] = [os.path.realpath(sys.prefix + '/lib/python/site-packages/mediaproxy')] |
|
+ sys.path[1:1] = [os.path.realpath(sys.prefix + '/lib/python/site-packages/mediaproxy/modules')] |
|
|
|
from optparse import OptionParser |
|
from options import ExtendedOptions |
|
diff -Naur mediaproxy.orig/utils/rtpgenerator.py mediaproxy/utils/rtpgenerator.py |
|
--- mediaproxy.orig/utils/rtpgenerator.py 2006-08-08 00:27:44.648994528 +0200 |
|
+++ mediaproxy/utils/rtpgenerator.py 2006-08-08 00:31:47.198121456 +0200 |
|
@@ -144,8 +144,8 @@ |
|
|
|
|
|
if __name__ == '__main__': |
|
- sys.path[1:1] = [os.path.realpath((os.path.dirname(sys.argv[0]) or '.') + '/../')] |
|
- sys.path[1:1] = [os.path.realpath((os.path.dirname(sys.argv[0]) or '.') + '/../modules')] |
|
+ sys.path[1:1] = [os.path.realpath(sys.prefix + '/lib/python/site-packages/mediaproxy')] |
|
+ sys.path[1:1] = [os.path.realpath(sys.prefix + '/lib/python/site-packages/mediaproxy/modules')] |
|
|
|
from optparse import OptionParser |
|
from options import ExtendedOptions |
|
diff -Naur mediaproxy.orig/modules/configuration.py mediaproxy/modules/configuration.py |
|
--- mediaproxy.orig/modules/configuration.py 2006-08-08 01:29:30.000000000 +0200 |
|
+++ mediaproxy/modules/configuration.py 2006-08-08 15:56:05.757138976 +0200 |
|
@@ -14,10 +14,8 @@ |
|
## ini file overwrites the same options from the former ini files in the list |
|
configFiles = ['/server/etc/mediaproxy/mediaproxy.ini'] |
|
|
|
-path = os.path.realpath((os.path.dirname(__file__) or '.') + '/..') |
|
- |
|
Configuration = ConfigParser() |
|
-Configuration.read(['%s/%s' % (path, f) for f in configFiles]) |
|
+Configuration.read(['%s' % (f) for f in configFiles]) |
|
|
|
|
|
class ConfigSection:
|
|
|