Commit 2c92ab97 authored by Stefan H. Holek's avatar Stefan H. Holek

Merged 2.9 branch r71304:71305 into the trunk.

- test.py lives in ZOPE_HOME for checkouts and ZOPE_HOME/bin for
  installations.
- Comparing abspaths does not fly when symlinks are involved; use
  realpaths instead.
parent 1bcfaa59
2.13 master x/poll y/cleanup-__del__ y/profile-fix 4.0a2 4.0a1 2.13.25 2.13.24 2.13.23 2.13.22 2.13.21 2.13.20 2.13.19 2.13.18 2.13.17 2.13.16 2.13.15 2.13.14 2.13.13 2.13.12 2.13.11 2.13.10 2.13.9 2.13.8 2.13.7 2.13.6 2.13.5 2.13.4 2.13.3 2.13.2 2.13.1 2.13.0 2.13.0c1 2.13.0b1 2.13.0a4 2.13.0a3 2.13.0a2 2.13.0a1 2.12.28 2.12.27 2.12.26 2.12.25 2.12.24 2.12.23 2.12.22 2.12.21 2.12.20 2.12.19 2.12.18 2.12.17 2.12.16 2.12.15 2.12.14 2.12.13 2.12.12 2.12.11 2.12.10 2.12.9 2.12.8 2.12.7 2.12.6 2.12.5 2.12.4 2.12.3 2.12.2 2.12.1 2.12.0 2.12.0c1 2.12.0b4 2.12.0b3 2.12.0b2 2.12.0b1 2.12.0a4 2.12.0a3 2.12.0a2 2.12.0a1 2.12-last-fulltree-revision 2.11.8 2.11.7 2.11.6 2.11.5 2.11.4 2.11.3 2.11.2 2.11.1 2.11.0 2.11.0c1 2.11.0b1 2.11.0a1 2.10.13 2.10.12 2.10.11 2.10.10 2.10.9 2.10.8 2.10.7 2.10.6 2.10.5 2.10.4 2.10.3 2.10.2 2.10.2b1 2.9.12 2.9.10 2.9.9 2.9.8 2.9.7 philikon-aq-checkpoint before-merging-console-scripts-branch backups/2.10-with-ZODB3.8@83153 backups/z4-zmi@124419 backups/witsch-zope2.11-with-standard-docutils@83154 backups/witsch-2.10-with-standard-docutils@76342 backups/tyam-unicodeSplitterPatch@104722 backups/tseaver-zope.app_delenda_est@110398 backups/tseaver-no_globals_imports@94459 backups/tseaver-instlib_as_site_dir@110397 backups/tseaver-clarify_install_docs@110394 backups/tseaver-2.11-no-z2-interfaces@110391 backups/shh-2.11-zopelitelayer@80865 backups/rochael-TM_sortKey@113726 backups/hannosch-dtml-vs-accesscontrol@113161 backups/gotcha-processlifetime@113938 backups/gotcha-LP143531@113945 backups/davisagli-copy-export@123222 backups/andig-catalog-report@115049 backups/ajung-zpt-encoding-fixes@71736 backups/ajung-2-11-prep-branch@82440 backups/acripps-resourceViewletDirective@75991
No related merge requests found
......@@ -21,22 +21,22 @@ $Id: test.py 33303 2005-07-13 22:28:33Z jim $
import os.path, sys
# Remove this directory from path:
here = os.path.abspath(os.path.dirname(sys.argv[0]))
sys.path[:] = [p for p in sys.path if os.path.abspath(p) != here]
# Remove script directory from path:
scriptdir = os.path.realpath(os.path.dirname(sys.argv[0]))
sys.path[:] = [p for p in sys.path if os.path.realpath(p) != scriptdir]
shome = os.environ.get('SOFTWARE_HOME')
zhome = os.environ.get('ZOPE_HOME')
ihome = os.environ.get('INSTANCE_HOME')
if zhome:
zhome = os.path.abspath(zhome)
zhome = os.path.realpath(zhome)
if shome:
shome = os.path.abspath(shome)
shome = os.path.realpath(shome)
else:
shome = os.path.join(zhome, 'lib', 'python')
elif shome:
shome = os.path.abspath(shome)
shome = os.path.realpath(shome)
zhome = os.path.dirname(os.path.dirname(shome))
elif ihome:
print >> sys.stderr, '''
......@@ -44,8 +44,13 @@ elif ihome:
must be set
'''
else:
# No zope home, assume that it is the script directory
zhome = os.path.abspath(os.path.dirname(sys.argv[0]))
# No zope home, derive it from script directory:
# (test.py lives in either ZOPE_HOME or ZOPE_HOME/bin)
parentdir, lastpart = os.path.split(scriptdir)
if lastpart == 'bin':
zhome = parentdir
else:
zhome = scriptdir
shome = os.path.join(zhome, 'lib', 'python')
sys.path.insert(0, shome)
......
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