[Zope3-checkins] SVN: Zope3/trunk/ use zope.app.twisted in the debugzope, zopectl scripts. And also fix the

[Michael Kerrin]

Log message for revision 39490:
  use zope.app.twisted in the debugzope, zopectl scripts. And also fix the
  `zopectl debug' command.
  

Changed:
  U   Zope3/trunk/src/zope/app/twisted/main.py
  U   Zope3/trunk/zopeskel/bin/debugzope.in
  U   Zope3/trunk/zopeskel/bin/zopectl.in

-=-
Modified: Zope3/trunk/src/zope/app/twisted/main.py
===================================================================
--- Zope3/trunk/src/zope/app/twisted/main.py	2005-10-17 17:56:12 UTC (rev 39489)
+++ Zope3/trunk/src/zope/app/twisted/main.py	2005-10-17 18:13:13 UTC (rev 39490)
@@ -82,8 +82,9 @@
 
     zope.app.appsetup.config(options.site_definition)
 
-    db = options.database.open()
+    db = zope.app.appsetup.appsetup.multi_database(options.databases)[0][0]
     notify(zope.app.appsetup.interfaces.DatabaseOpened(db))
+
     return db
 
 

Modified: Zope3/trunk/zopeskel/bin/debugzope.in
===================================================================
--- Zope3/trunk/zopeskel/bin/debugzope.in	2005-10-17 17:56:12 UTC (rev 39489)
+++ Zope3/trunk/zopeskel/bin/debugzope.in	2005-10-17 18:13:13 UTC (rev 39490)
@@ -34,7 +34,7 @@
     sys.path[:] = [os.path.join(INSTANCE_HOME, "lib", "python"),
                    SOFTWARE_HOME] + basepath
 
-    from zope.app.server.main import debug
+    from zope.app.twisted.main import debug
     db = debug(["-C", CONFIG_FILE] + sys.argv[1:])
     if "PYTHONSTARTUP" in os.environ:
         execfile(os.environ["PYTHONSTARTUP"])

Modified: Zope3/trunk/zopeskel/bin/zopectl.in
===================================================================
--- Zope3/trunk/zopeskel/bin/zopectl.in	2005-10-17 17:56:12 UTC (rev 39489)
+++ Zope3/trunk/zopeskel/bin/zopectl.in	2005-10-17 18:13:13 UTC (rev 39490)
@@ -34,9 +34,9 @@
     sys.path[:] = [os.path.join(INSTANCE_HOME, "lib", "python"),
                    SOFTWARE_HOME] + basepath
 
-    import zope.app.server.controller
-    zope.app.server.controller.INSTANCE_HOME = INSTANCE_HOME
-    zope.app.server.controller.main(["-C", CONFIG_FILE] + sys.argv[1:])
+    import zope.app.twisted.controller
+    zope.app.twisted.controller.INSTANCE_HOME = INSTANCE_HOME
+    zope.app.twisted.controller.main(["-C", CONFIG_FILE] + sys.argv[1:])
 
 
 if __name__ == '__main__':