Commit 5b7e11cb authored by David Glick's avatar David Glick

look for ZEXP imports in the clienthome dir too

parent 15f389dd
...@@ -8,6 +8,10 @@ Zope Changes ...@@ -8,6 +8,10 @@ Zope Changes
Bugs fixed Bugs fixed
- Also look for ZEXP imports within the clienthome directory. This
provides a place to put imports that won't be clobbered by buildout
in a buildout-based Zope instance.
- LP #143444: add labels to checkboxes / radio buttons on - LP #143444: add labels to checkboxes / radio buttons on
import / export form. import / export form.
......
...@@ -642,6 +642,8 @@ class ObjectManager( ...@@ -642,6 +642,8 @@ class ObjectManager(
paths = [cfg.zopehome] paths = [cfg.zopehome]
if not cfg.instancehome in paths: if not cfg.instancehome in paths:
paths.append(cfg.instancehome) paths.append(cfg.instancehome)
if not cfg.clienthome in paths:
paths.append(cfg.clienthome)
for impath in paths: for impath in paths:
directory = os.path.join(impath, 'import') directory = os.path.join(impath, 'import')
if not os.path.isdir(directory): if not os.path.isdir(directory):
......
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