Commit 832ddf16 authored by Hanno Schlichting's avatar Hanno Schlichting

Merge c128116 from 2.13 branch

parent 77cd294c
...@@ -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