Commit 95f9876a authored by Hanno Schlichting's avatar Hanno Schlichting

LP #1058049: Fix support for zoperunner section in zope.conf.

parent 6c8ae2ba
...@@ -18,6 +18,8 @@ http://docs.zope.org/zope2/releases/. ...@@ -18,6 +18,8 @@ http://docs.zope.org/zope2/releases/.
- repoze.tm2 = 1.0 - repoze.tm2 = 1.0
- tempstorage = 2.12.2 - 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` - Explicitly close all databases on shutdown, which ensures `Data.fs.index`
gets written to the file system. gets written to the file system.
......
...@@ -180,6 +180,7 @@ class ZopeCtlOptions(ZDOptions): ...@@ -180,6 +180,7 @@ class ZopeCtlOptions(ZDOptions):
self.directory = config.instancehome self.directory = config.instancehome
self.clienthome = config.clienthome self.clienthome = config.clienthome
if self.program: if self.program:
if isinstance(self.program, basestring):
self.program = [self.program] self.program = [self.program]
elif config.runner and config.runner.program: elif config.runner and config.runner.program:
self.program = config.runner.program self.program = config.runner.program
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment