Commit 32e48648 authored by Guido van Rossum's avatar Guido van Rossum

Get the schema from the ZEO directory, not from the directory where

runzeo.py lives -- that didn't work when runzeo.py is installed in
/usr/local/bin.
parent b5202cfe
...@@ -39,6 +39,7 @@ import socket ...@@ -39,6 +39,7 @@ import socket
import ZConfig, ZConfig.datatypes import ZConfig, ZConfig.datatypes
import zLOG import zLOG
import ZEO
from zdaemon.zdoptions import ZDOptions from zdaemon.zdoptions import ZDOptions
def parse_address(arg): def parse_address(arg):
...@@ -93,7 +94,7 @@ class ZEOOptions(ZDOptions, ZEOOptionsMixin): ...@@ -93,7 +94,7 @@ class ZEOOptions(ZDOptions, ZEOOptionsMixin):
logsectionname = "logger" logsectionname = "logger"
def __init__(self): def __init__(self):
self.schemadir = os.path.dirname(__file__) self.schemadir = os.path.dirname(ZEO.__file__)
ZDOptions.__init__(self) ZDOptions.__init__(self)
self.add_zeo_options() self.add_zeo_options()
self.add("storages", "storages", self.add("storages", "storages",
...@@ -273,5 +274,4 @@ def main(args=None): ...@@ -273,5 +274,4 @@ def main(args=None):
s.main() s.main()
if __name__ == "__main__": if __name__ == "__main__":
__file__ = sys.argv[0]
main() main()
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment