[Zope-Checkins] CVS: Zope/lib/python/Zope/Startup - ZctlLib.py:1.1.2.3 datatypes.py:1.1.2.3 zopeschema.xml:1.1.2.6

[Chris McDonough]

Update of /cvs-repository/Zope/lib/python/Zope/Startup
In directory cvs.zope.org:/tmp/cvs-serv19065/lib/python/Zope/Startup

Modified Files:
      Tag: chrism-install-branch
	ZctlLib.py datatypes.py zopeschema.xml 
Log Message:
Make Windows installs work again.


=== Zope/lib/python/Zope/Startup/ZctlLib.py 1.1.2.2 => 1.1.2.3 ===
--- Zope/lib/python/Zope/Startup/ZctlLib.py:1.1.2.2	Mon Jan 13 12:14:57 2003
+++ Zope/lib/python/Zope/Startup/ZctlLib.py	Mon Jan 13 14:28:40 2003
@@ -111,6 +111,7 @@
             loc = '"%s"' % loc
         config_location = '--config=%s' % loc
         start_script = os.path.join(self._getSoftwareHome(), 'zope.py')
+        start_script = cmdquote(start_script)
         args = [start_script] + [config_location] + opts + [arg]
         wait = self._getConfigValue('debug_mode')
         try:
@@ -296,7 +297,7 @@
         overrides = self._getOverrides()
         return(
             "import os, sys; os.environ['EVENT_LOG_SEVERITY']='300'; "
-            "sys.path.insert(0, '%s'); from Startup import configure; "
+            "sys.path.insert(0, '%s'); from Zope.Startup import configure; "
             "configure('%s', %s); import Zope; app=Zope.app()"
             % ( swhome, self._getConfigLocation(), overrides)
             )


=== Zope/lib/python/Zope/Startup/datatypes.py 1.1.2.2 => 1.1.2.3 ===
--- Zope/lib/python/Zope/Startup/datatypes.py:1.1.2.2	Thu Jan  9 15:58:06 2003
+++ Zope/lib/python/Zope/Startup/datatypes.py	Mon Jan 13 14:28:40 2003
@@ -11,6 +11,14 @@
             )
     return value
 
+def use_daemon_process(value):
+    import os
+    from ZConfig.datatypes import asBoolean
+    # cannot use daemon process on non-POSIX platforms
+    if os.name != 'posix':
+        return False
+    return asBoolean(value)
+
 # log-related datatypes
 
 def log_format(value):


=== Zope/lib/python/Zope/Startup/zopeschema.xml 1.1.2.5 => 1.1.2.6 ===
--- Zope/lib/python/Zope/Startup/zopeschema.xml:1.1.2.5	Thu Jan  9 15:58:06 2003
+++ Zope/lib/python/Zope/Startup/zopeschema.xml	Mon Jan 13 14:28:40 2003
@@ -127,7 +127,7 @@
 
   <key name="python-check-interval" datatype="integer" default="500"/>
 
-  <key name="use-daemon-process" datatype="boolean" default="on"
+  <key name="use-daemon-process" datatype=".use_daemon_process" default="on"
        handler="use_daemon_process"/>
 
   <key name="zserver-read-only-mode" datatype="boolean" default="off"