Collector #118: fixed wrong import path for Examples.zexp

lib/python/OFS/Application.py

@@ -12,8 +12,8 @@
 ##############################################################################
 __doc__='''Application support
 
-$Id: Application.py,v 1.177 2001/12/13 21:06:34 amos Exp $'''
-__version__='$Revision: 1.177 $'[11:-2]
+$Id: Application.py,v 1.178 2002/01/09 19:06:34 andreasjung Exp $'''
+__version__='$Revision: 1.178 $'[11:-2]
 
 import Globals,Folder,os,sys,App.Product, App.ProductRegistry, misc_
 import time, traceback, os, string, Products
@@ -368,9 +368,17 @@ def initialize(app):
     # Ensure that there's an Examples folder with examples.
     # 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