[Zope-Checkins] CVS: Zope/lib/python/OFS - Application.py:1.178

[Andreas Jung]

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

Modified Files:
	Application.py 
Log Message:
Collector #118: fixed wrong import path for Examples.zexp


=== Zope/lib/python/OFS/Application.py 1.177 => 1.178 ===
     # However, make sure that if the examples have been added already
     # and then deleted that we don't add them again.
+
+
     if not hasattr(app, 'Examples') and not \
        hasattr(app, '_Zope25_examples_have_been_added'):
+<<<<<<< Application.py
         examples_path = os.path.join(Globals.INSTANCE_HOME, 'import', 'Examples.zexp')
+=======
+
+        examples_path = os.path.join(Globals.SOFTWARE_HOME, \
+             '..','..','import', 'Examples.zexp')
+>>>>>>> 1.176.2.2
         if os.path.isfile(examples_path):
             app._importObjectFromFile(examples_path, verify=0)
             app._Zope25_examples_have_been_added=1