[Zodb-checkins] CVS: ZODB3/zdaemon - zdctl.py:1.44

[Jeremy Hylton]

Update of /cvs-repository/ZODB3/zdaemon
In directory cvs.zope.org:/tmp/cvs-serv29167/zdaemon

Modified Files:
	zdctl.py 
Log Message:
Merge changes from ZODB3-3_2-branch to Zope-2_7-branch.

Please make all future changes on the Zope-2_7-branch instead.


=== ZODB3/zdaemon/zdctl.py 1.43 => 1.44 ===
--- ZODB3/zdaemon/zdctl.py:1.43	Tue Mar 11 17:46:58 2003
+++ ZODB3/zdaemon/zdctl.py	Mon Sep 15 12:29:13 2003
@@ -42,11 +42,6 @@
 
 from __future__ import nested_scopes
 
-# XXX Related code lives in lib/python/Zope/Startup/ZctlLib.py on the
-# 'chrism-install-branch' branch.
-# The code there knows more about Zope and about Windows, but doesn't
-# use zdaemon.py or ZConfig.
-
 import os
 import re
 import cmd
@@ -87,7 +82,7 @@
         self.add("logfile", "runner.logfile", "l:", "logfile=")
         self.add("python", "runner.python")
         self.add("zdrun", "runner.zdrun")
-        self.add("prompt", "runner.prompt")
+        self.add("prompt", "runner.prompt", default="zdctl>")
 
     def realize(self, *args, **kwds):
         RunnerOptions.realize(self, *args, **kwds)