[Zope-Checkins] SVN: Zope/trunk/src/Zope2/Startup/ make runzope -h work onc the new zdaemon release is used.

[Chris Withers]

Log message for revision 99072:
  make runzope -h work onc the new zdaemon release is used.

Changed:
  U   Zope/trunk/src/Zope2/Startup/options.py
  U   Zope/trunk/src/Zope2/Startup/run.py

-=-
Modified: Zope/trunk/src/Zope2/Startup/options.py
===================================================================
--- Zope/trunk/src/Zope2/Startup/options.py	2009-04-10 09:50:13 UTC (rev 99071)
+++ Zope/trunk/src/Zope2/Startup/options.py	2009-04-10 10:02:10 UTC (rev 99072)
@@ -20,7 +20,30 @@
 
 
 class ZopeOptions(zdaemon.zdoptions.ZDOptions):
+    """The Zope zdaemon runner script.
 
+    Usage: python Zope2/run.py [-C URL][-h] [zdrun-options] [action [arguments]]
+
+    Options:
+    -C/--configure URL -- configuration file or URL
+    -h/--help -- print usage message and exit
+    -b/--backoff-limit SECONDS -- set backoff limit to SECONDS (default 10)
+    -d/--daemon -- run as a proper daemon; fork a subprocess, close files etc.
+    -f/--forever -- run forever (by default, exit when backoff limit is exceeded)
+    -h/--help -- print this usage message and exit
+    -s/--socket-name SOCKET -- Unix socket name for client (default "zdsock")
+    -u/--user USER -- run as this user (or numeric uid)
+    -m/--umask UMASK -- use this umask for daemon subprocess (default is 022)
+    -x/--exit-codes LIST -- list of fatal exit codes (default "0,2")
+    -z/--directory DIRECTORY -- directory to chdir to when using -d (default off)
+    action [arguments] -- see below
+
+    Actions are commands like "start", "stop" and "status".  If -i is
+    specified or no action is specified on the command line, a "shell"
+    interpreting actions typed interactively is started (unless the
+    configuration option default_to_interactive is set to false).  Use the
+    action "help" to find out about available actions.
+    """
+
     schemadir = os.path.dirname(os.path.abspath(__file__))
     schemafile = "zopeschema.xml"
-

Modified: Zope/trunk/src/Zope2/Startup/run.py
===================================================================
--- Zope/trunk/src/Zope2/Startup/run.py	2009-04-10 09:50:13 UTC (rev 99071)
+++ Zope/trunk/src/Zope2/Startup/run.py	2009-04-10 10:02:10 UTC (rev 99072)
@@ -43,9 +43,9 @@
     opts = options.ZopeOptions()
     if configfile:
         opts.configfile = configfile
-        opts.realize(doc="Sorry, no option docs yet.", raise_getopt_errs=0)
+        opts.realize(raise_getopt_errs=0)
     else:
-        opts.realize(doc="Sorry, no option docs yet.")
+        opts.realize()
 
     handlers.handleConfig(opts.configroot, opts.confighandlers)
     import App.config