[Zope-Checkins] CVS: Zope/lib/python/OFS - Application.py:1.183.10.1 ObjectManager.py:1.150.10.1

[Matt Behrens]

Update of /cvs-repository/Zope/lib/python/OFS
In directory cvs.zope.org:/tmp/cvs-serv18365/lib/python/OFS

Modified Files:
      Tag: zigg_unix-install-control-config-branch
	Application.py ObjectManager.py 
Log Message:
More progress:

- Rewrite the control script to not have any special knowledge of
  'create', to help maintain the divorce from what the software home's
  control package does.

- Add ZOPE_HOME, now that it's needed (to look at the default imports).

- A few more portability fixes (now working on Linux).

- Start to option-enable z2.py, though there is no code yet.



=== Zope/lib/python/OFS/Application.py 1.183 => 1.183.10.1 ===
        hasattr(app, '_Zope25_examples_have_been_added'):
 
-        examples_path = os.path.join(Globals.SOFTWARE_HOME, \
-             '..','..','import', 'Examples.zexp')
+        examples_path = os.path.join(Globals.ZOPE_HOME, \
+             'import', 'Examples.zexp')
 
         if os.path.isfile(examples_path):
             app._importObjectFromFile(examples_path, verify=0)


=== Zope/lib/python/OFS/ObjectManager.py 1.150 => 1.150.10.1 ===
 
         instance_home = INSTANCE_HOME
-        software_home = os.path.join(SOFTWARE_HOME, '..%s..' % os.sep)
-        software_home = os.path.normpath(software_home)
+	zope_home = ZOPE_HOME
         
-        for impath in (instance_home, software_home):
+        for impath in (instance_home, zope_home):
             filepath = os.path.join(impath, 'import', file)
             if os.path.exists(filepath):
                 break