[Zodb-checkins] SVN: ZODB/trunk/ Mrege rev 38358 from 3.5 branch.

[Tim Peters]

Log message for revision 38359:
  Mrege rev 38358 from 3.5 branch.
  
  Re-add the zeoctl module to ZEO, and rewrite runzeo so
  it can run as a main program (the scripts created by
  mkzeoinstance.py expect to be able to do this).
  

Changed:
  U   ZODB/trunk/NEWS.txt
  U   ZODB/trunk/src/ZEO/runzeo.py
  A   ZODB/trunk/src/ZEO/zeoctl.py
  U   ZODB/trunk/src/scripts/zeoctl.py

-=-
Modified: ZODB/trunk/NEWS.txt
===================================================================
--- ZODB/trunk/NEWS.txt	2005-09-07 20:46:00 UTC (rev 38358)
+++ ZODB/trunk/NEWS.txt	2005-09-07 20:55:39 UTC (rev 38359)
@@ -51,6 +51,9 @@
   not be compiled from a ZODB release, since some of the C header files
   needed appear only in Zope.
 
+- (3.6a3) Re-added the ``zeoctl`` module, for the same reasons
+  ``mkzeoinst`` was re-added (see below).
+
 - (3.6a2) The ``mkzeoinst`` module was re-added to ZEO, because Zope3
   has a script that expects to import it from there.  ZODB's ``mkzeoinst``
   script was rewritten to invoke the ``mkzeoinst`` module.
@@ -63,11 +66,15 @@
 Following is combined news from internal releases (to support ongoing
 Zope3 development).  These are the dates of the internal releases:
 
+- 3.5.1b2 07-Sep-2005
 - 3.5.1b1 06-Sep-2005
 
 Build
 -----
 
+- (3.5.1b2) Re-added the ``zeoctl`` module, for the same reasons
+  ``mkzeoinst`` was re-added (see below).
+
 - (3.5.1b1) The ``mkzeoinst`` module was re-added to ZEO, because Zope3
   has a script that expects to import it from there.  ZODB's ``mkzeoinst``
   script was rewritten to invoke the ``mkzeoinst`` module.

Modified: ZODB/trunk/src/ZEO/runzeo.py
===================================================================
--- ZODB/trunk/src/ZEO/runzeo.py	2005-09-07 20:46:00 UTC (rev 38358)
+++ ZODB/trunk/src/ZEO/runzeo.py	2005-09-07 20:55:39 UTC (rev 38359)
@@ -351,3 +351,6 @@
     options.realize(args)
     s = ZEOServer(options)
     s.main()
+
+if __name__ == "__main__":
+    main()

Copied: ZODB/trunk/src/ZEO/zeoctl.py (from rev 38358, ZODB/branches/3.5/src/ZEO/zeoctl.py)


Property changes on: ZODB/trunk/src/ZEO/zeoctl.py
___________________________________________________________________
Name: svn:keywords
   + Id
Name: svn:eol-style
   + native

Modified: ZODB/trunk/src/scripts/zeoctl.py
===================================================================
--- ZODB/trunk/src/scripts/zeoctl.py	2005-09-07 20:46:00 UTC (rev 38358)
+++ ZODB/trunk/src/scripts/zeoctl.py	2005-09-07 20:55:39 UTC (rev 38359)
@@ -1,20 +1,19 @@
 #!/usr/bin/env python2.3
+##############################################################################
+#
+# Copyright (c) 2005 Zope Corporation and Contributors.
+# All Rights Reserved.
+#
+# This software is subject to the provisions of the Zope Public License,
+# Version 2.1 (ZPL).  A copy of the ZPL should accompany this distribution.
+# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
+# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
+# FOR A PARTICULAR PURPOSE
+#
+##############################################################################
 
 """Wrapper script for zdctl.py that causes it to use the ZEO schema."""
 
-import os
-
-import ZEO
-import zdaemon.zdctl
-
-
-# Main program
-def main(args=None):
-    options = zdaemon.zdctl.ZDCtlOptions()
-    options.schemadir = os.path.dirname(ZEO.__file__)
-    options.schemafile = "zeoctl.xml"
-    zdaemon.zdctl.main(args, options)
-
-
-if __name__ == "__main__":
-    main()
+from ZEO.zeoctl import main
+main()