Log message for revision 40484: Made 'zopectl test' work for software homes which do not have an "inplace" build. It used to require that test.py be in $ZOPE_HOME/bin/; now it will use $ZOPE_HOME as a fallback.
Changed: U Zope/branches/Zope-2_8-branch/doc/CHANGES.txt U Zope/branches/Zope-2_8-branch/lib/python/Zope2/Startup/zopectl.py -=- Modified: Zope/branches/Zope-2_8-branch/doc/CHANGES.txt =================================================================== --- Zope/branches/Zope-2_8-branch/doc/CHANGES.txt 2005-12-02 16:35:58 UTC (rev 40483) +++ Zope/branches/Zope-2_8-branch/doc/CHANGES.txt 2005-12-02 16:41:32 UTC (rev 40484) @@ -58,6 +58,10 @@ Other + - Made 'zopectl test' work for software homes which do not have + an "inplace" build (it used to require that test.py be in + $ZOPE_HOME/bin/; now it will use $ZOPE_HOME as a fallback). + - Improved logging of ConflictErrors. All conflict errors are logged at INFO, with counts of how many occurred and how many were resolved. Tracebacks for all conflicts are logged a DEBUG Modified: Zope/branches/Zope-2_8-branch/lib/python/Zope2/Startup/zopectl.py =================================================================== --- Zope/branches/Zope-2_8-branch/lib/python/Zope2/Startup/zopectl.py 2005-12-02 16:35:58 UTC (rev 40483) +++ Zope/branches/Zope-2_8-branch/lib/python/Zope2/Startup/zopectl.py 2005-12-02 16:41:32 UTC (rev 40484) @@ -238,6 +238,8 @@ return script = os.path.join(zope_home, 'bin', 'test.py') + if not os.path.exists(script): + script = os.path.join(zope_home, 'test.py') # no inplace build! assert os.path.exists(script) # If --libdir is not supplied, use $INSTANCE_HOME/Products _______________________________________________ Zope-Checkins maillist - Zope-Checkins@zope.org http://mail.zope.org/mailman/listinfo/zope-checkins