[Zope-Checkins] CVS: Zope2 - FindHomes.py:1.5.16.1

evan@serenade.digicool.com evan@serenade.digicool.com
Fri, 11 May 2001 14:20:44 -0400


Update of /cvs-repository/Zope2/lib/python/App
In directory serenade:/home/evan/Zope/2.3/lib/python/App

Modified Files:
      Tag: zope-2_3-branch
	FindHomes.py 
Log Message:
Merge change from trunk.



--- Updated File FindHomes.py in package Zope2 --
--- FindHomes.py	2000/12/11 17:59:46	1.5
+++ FindHomes.py	2001/05/11 18:20:44	1.5.16.1
@@ -105,13 +105,18 @@
 
 sys.modules['__builtin__'].SOFTWARE_HOME=SOFTWARE_HOME=home
 
-try: chome=os.environ['INSTANCE_HOME']
+try:
+    chome=os.environ['INSTANCE_HOME']
 except:
     chome=home
     d,e=path_split(chome)
     if e=='python':
         d,e=path_split(d)
         if e=='lib': chome=d or os.getcwd()
+else:
+    inst_ppath = path_join(chome, 'lib', 'python')
+    if os.path.isdir(inst_ppath):
+        sys.path.insert(0, inst_ppath)
     
 sys.modules['__builtin__'].INSTANCE_HOME=INSTANCE_HOME=chome