Log message for revision 107525: look for ZEXP imports in the clienthome dir too
Changed: U Zope/branches/2.10/doc/CHANGES.txt U Zope/branches/2.10/lib/python/OFS/ObjectManager.py -=- Modified: Zope/branches/2.10/doc/CHANGES.txt =================================================================== --- Zope/branches/2.10/doc/CHANGES.txt 2010-01-01 23:17:41 UTC (rev 107524) +++ Zope/branches/2.10/doc/CHANGES.txt 2010-01-02 03:20:02 UTC (rev 107525) @@ -8,6 +8,10 @@ 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 import / export form. Modified: Zope/branches/2.10/lib/python/OFS/ObjectManager.py =================================================================== --- Zope/branches/2.10/lib/python/OFS/ObjectManager.py 2010-01-01 23:17:41 UTC (rev 107524) +++ Zope/branches/2.10/lib/python/OFS/ObjectManager.py 2010-01-02 03:20:02 UTC (rev 107525) @@ -642,6 +642,8 @@ paths = [cfg.zopehome] if not cfg.instancehome in paths: paths.append(cfg.instancehome) + if not cfg.clienthome in paths: + paths.append(cfg.clienthome) for impath in paths: directory = os.path.join(impath, 'import') if not os.path.isdir(directory): _______________________________________________ Zope-Checkins maillist - Zope-Checkins@zope.org https://mail.zope.org/mailman/listinfo/zope-checkins