[Zope-Checkins] SVN: Zope/branches/philikon-aq/lib/python/Zope2/App/startup.py If we are going in circles without getting the error_message just raise

[Hanno Schlichting]

Log message for revision 78443:
  If we are going in circles without getting the error_message just raise
  

Changed:
  U   Zope/branches/philikon-aq/lib/python/Zope2/App/startup.py

-=-
Modified: Zope/branches/philikon-aq/lib/python/Zope2/App/startup.py
===================================================================
--- Zope/branches/philikon-aq/lib/python/Zope2/App/startup.py	2007-07-28 22:18:08 UTC (rev 78442)
+++ Zope/branches/philikon-aq/lib/python/Zope2/App/startup.py	2007-07-28 22:30:37 UTC (rev 78443)
@@ -18,6 +18,7 @@
 from AccessControl.SecurityManagement import newSecurityManager
 from AccessControl.SecurityManagement import noSecurityManager
 from Acquisition import aq_acquire
+from Acquisition import aq_base
 from Acquisition import aq_inner
 from Acquisition import aq_parent
 from App.config import getConfiguration
@@ -239,7 +240,9 @@
                 if getattr(client, self.error_message, None) is not None:
                     break
                 client = aq_parent(client)
-                if client is None:
+                # If we are going in circles without getting the error_message
+                # just raise
+                if client is None or aq_base(client) is aq_base(published):
                     raise t, v, traceback
 
             if REQUEST.get('AUTHENTICATED_USER', None) is None: