Merge pull request #7 from zopefoundation/fix-6

fix #6: Broken with ZEO 5.1.1: runzeo and zeoctl fails
zopefoundation · May 23, 2017 · a5f4db3 · a5f4db3
2 parents 7ed33bb + a43a0e6
commit a5f4db3
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 11 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -4,7 +4,7 @@ Changelog
 4.1 (unreleased)
 ----------------
 
-- Nothing changed yet.
+- Fix generated ``runzeo`` and ``zeoctl`` scripts to run with ZEO 5.
 
 
 4.0 (2017-02-28)

diff --git a/src/zope/mkzeoinstance/__init__.py b/src/zope/mkzeoinstance/__init__.py
@@ -116,9 +116,7 @@
 PYTHONPATH="$ZODB3_HOME"
 export PYTHONPATH INSTANCE_HOME
 
-ZEOCTL="$ZODB3_HOME/ZEO/zeoctl.py"
-
-exec "$PYTHON" "$ZEOCTL" -C "$CONFIG_FILE" ${1+"$@"}
+exec "$PYTHON" -m ZEO.zeoctl -C "$CONFIG_FILE" ${1+"$@"}
 """
 
 
@@ -135,9 +133,7 @@
 PYTHONPATH="$ZODB3_HOME"
 export PYTHONPATH INSTANCE_HOME
 
-RUNZEO="$ZODB3_HOME/ZEO/runzeo.py"
-
-exec "$PYTHON" "$RUNZEO" -C "$CONFIG_FILE" ${1+"$@"}
+exec "$PYTHON" -m ZEO.runzeo -C "$CONFIG_FILE" ${1+"$@"}
 """
 
 
@@ -197,7 +193,7 @@ def run(self, argv,
             if k in ('-h', '--help'):
                 usage(rc=2)
 
-        if len(args) < 1 or len(args) > 2:  
+        if len(args) < 1 or len(args) > 2:
             usage(rc=1)
 
         instance_home = os.path.abspath(args[0])

diff --git a/src/zope/mkzeoinstance/tests/test_unix.py b/src/zope/mkzeoinstance/tests/test_unix.py
@@ -271,9 +271,7 @@ def test_zeoctl_content(self):
             'PYTHONPATH="$ZODB3_HOME"',
             'export PYTHONPATH INSTANCE_HOME',
             '',
-            'ZEOCTL="$ZODB3_HOME/ZEO/zeoctl.py"',
-            '',
-            'exec "$PYTHON" "$ZEOCTL" -C "$CONFIG_FILE" ${1+"$@"}',
+            'exec "$PYTHON" -m ZEO.zeoctl -C "$CONFIG_FILE" ${1+"$@"}',
             '',
             ]) % params