patch-zeya_py 1.2 KB

123456789101112131415161718192021222324252627282930313233
  1. $OpenBSD: patch-zeya_py,v 1.1.1.1 2011/07/20 07:54:58 dcoppa Exp $
  2. --- zeya.py.orig Tue Sep 21 08:13:42 2010
  3. +++ zeya.py Mon Jul 11 18:59:16 2011
  4. @@ -50,6 +50,10 @@ try:
  5. except (ImportError, AttributeError):
  6. import simplejson as json
  7. +modules_dir = '${TRUEPREFIX}/lib/zeya'
  8. +
  9. +sys.path.append(modules_dir)
  10. +
  11. import backends
  12. import decoders
  13. import options
  14. @@ -347,7 +351,7 @@ def run_server(backend, bind_address, port, bitrate, b
  15. 'playlists': playlists }
  16. library_repr = json.dumps(output, ensure_ascii=False)
  17. - basedir = os.path.abspath(os.path.dirname(os.path.realpath(sys.argv[0])))
  18. + basedir = modules_dir
  19. auth_data = None
  20. if basic_auth_file is not None:
  21. @@ -357,7 +361,7 @@ def run_server(backend, bind_address, port, bitrate, b
  22. auth_data[s_user] = s_pass
  23. zeya_handler = ZeyaHandler(backend,
  24. library_repr,
  25. - os.path.join(basedir, 'resources'),
  26. + '${TRUEPREFIX}/share/zeya',
  27. bitrate,
  28. auth_type=NO_AUTH if basic_auth_file is None else BASIC_AUTH,
  29. auth_data=auth_data,