[Zope-Checkins] SVN: Zope/trunk/src/Zope2/Startup/zopectl.py allow the -p option to zopectl to work again, handy for buildout-based zope instances

[Chris Withers]

Log message for revision 115377:
  allow the -p option to zopectl to work again, handy for buildout-based zope instances

Changed:
  U   Zope/trunk/src/Zope2/Startup/zopectl.py

-=-
Modified: Zope/trunk/src/Zope2/Startup/zopectl.py
===================================================================
--- Zope/trunk/src/Zope2/Startup/zopectl.py	2010-08-02 11:53:26 UTC (rev 115376)
+++ Zope/trunk/src/Zope2/Startup/zopectl.py	2010-08-02 13:38:05 UTC (rev 115377)
@@ -114,11 +114,14 @@
     
 
     positional_args_allowed = 1
-    program = "zopectl"
     schemadir = os.path.dirname(Zope2.Startup.__file__)
     schemafile = "zopeschema.xml"
     uid = gid = None
 
+    # this indicates that no explict program has been provided.
+    # the command line option can set this.
+    program = None
+    
     # XXX Suppress using Zope's <eventlog> section to avoid using the
     # same logging for zdctl as for the Zope appserver.  There still
     # needs to be a way to set a logfile for zdctl.
@@ -169,7 +172,9 @@
         config = self.configroot
         self.directory = config.instancehome
         self.clienthome = config.clienthome
-        if config.runner and config.runner.program:
+        if self.program:
+            self.program = [self.program]
+        elif config.runner and config.runner.program:
             self.program = config.runner.program
         else:
             self.program = [os.path.join(self.directory, "bin", "runzope")]