Merge c128116 from 2.13 branch

832ddf16 · Hanno Schlichting · 77cd294c · 832ddf16
Commit 832ddf16 authored Oct 21, 2012 by Hanno Schlichting
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

src/Zope2/Startup/zopectl.py src/Zope2/Startup/zopectl.py +2 -1

No files found.
--- a/src/Zope2/Startup/zopectl.py
+++ b/src/Zope2/Startup/zopectl.py
@@ -180,7 +180,8 @@ class ZopeCtlOptions(ZDOptions):
        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: