SVN: Zope/branches/2.13/ LP #1058049: Fix support for zoperunner section in zope.conf.

Hano Schlichting <[email protected]> Sun, 21 Oct 2012 15:57:27 -0400 (EDT)
Newsgroups gmane.comp.web.zope.cvs
Message-ID <20121021195727.63A2B940F9__24667.6446091898$1350849458$gmane$org@cvs.zope.org>
Log message for revision 128116:
  LP #1058049: Fix support for zoperunner section in zope.conf.
  

Changed:
  U   Zope/branches/2.13/doc/CHANGES.rst
  U   Zope/branches/2.13/src/Zope2/Startup/zopectl.py

-=-
Modified: Zope/branches/2.13/doc/CHANGES.rst
===================================================================
--- Zope/branches/2.13/doc/CHANGES.rst	2012-10-21 19:42:30 UTC (rev 128115)
+++ Zope/branches/2.13/doc/CHANGES.rst	2012-10-21 19:57:24 UTC (rev 128116)
@@ -18,6 +18,8 @@
   - repoze.tm2 = 1.0
   - tempstorage = 2.12.2
 
+- LP #1058049: Fix support for zoperunner section in zope.conf.
+
 - Explicitly close all databases on shutdown, which ensures `Data.fs.index`
   gets written to the file system.
 

Modified: Zope/branches/2.13/src/Zope2/Startup/zopectl.py
===================================================================
--- Zope/branches/2.13/src/Zope2/Startup/zopectl.py	2012-10-21 19:42:30 UTC (rev 128115)
+++ Zope/branches/2.13/src/Zope2/Startup/zopectl.py	2012-10-21 19:57:24 UTC (rev 128116)
@@ -180,7 +180,8 @@
         self.directory = config.instancehome
         self.clienthome = config.clienthome
         if self.program:
-            self.program = [self.program]
+            if isinstance(self.program, basestring):
+                self.program = [self.program]
         elif config.runner and config.runner.program:
             self.program = config.runner.program
         else:

_______________________________________________
Zope-Checkins maillist  -  [email protected]
https://mail.zope.org/mailman/listinfo/zope-checkins