Reenable web-controlled restart under the zdctl regime.

lib/python/App/ApplicationManager.py

@@ -12,7 +12,7 @@
 ##############################################################################
 __doc__="""System management components"""
 
-__version__='$Revision: 1.87 $'[11:-2]
+__version__='$Revision: 1.88 $'[11:-2]
 
 import sys,os,time,Globals, Acquisition, os, Undo
 from Globals import DTMLFile
@@ -318,10 +318,7 @@ class ApplicationManager(Folder,CacheManager):
         if s >= 1048576.0: return '%.1fM' % (s/1048576.0)
         return '%.1fK' % (s/1024.0)
 
-
-
-    if hasattr(sys, 'ZMANAGED'):
-
+    if os.environ.has_key('ZMANAGED'):
         manage_restartable=1
         def manage_restart(self, URL1):
             """Shut down the application"""

lib/python/Zope/Startup/zopectl.py

@@ -117,6 +117,11 @@ class ZopeCmd(ZDCmd):
             args = [opt, svalue]
         return args
 
+    def do_start(self, arg):
+        # signal to Zope that it is being managed
+        #(to indicate it's web-restartable)
+        os.putenv('ZMANAGED', '1')
+        ZDCmd.do_start(self, arg)
 
 def main(args=None):
     # This is exactly like zdctl.main(), but uses ZopeCtlOptions and