[Checkins] SVN: five.localsitemanager/trunk/ - fail silently to make it possible to import broken sites

[Yvo Schubbe]

Log message for revision 107207:
  - fail silently to make it possible to import broken sites

Changed:
  U   five.localsitemanager/trunk/CHANGES.txt
  U   five.localsitemanager/trunk/src/five/localsitemanager/__init__.py

-=-
Modified: five.localsitemanager/trunk/CHANGES.txt
===================================================================
--- five.localsitemanager/trunk/CHANGES.txt	2009-12-28 11:49:59 UTC (rev 107206)
+++ five.localsitemanager/trunk/CHANGES.txt	2009-12-28 11:50:00 UTC (rev 107207)
@@ -1,6 +1,13 @@
 Changelog
 =========
 
+2.0.3 - unreleased
+------------------
+
+* Made 'update_sitemanager_bases_handler' fail silently instead of raising an
+  error. This allows to import broken sites, in particular old CMF sites.
+  [yuppie]
+
 2.0.2 - 2009-11-15
 ------------------
 

Modified: five.localsitemanager/trunk/src/five/localsitemanager/__init__.py
===================================================================
--- five.localsitemanager/trunk/src/five/localsitemanager/__init__.py	2009-12-28 11:49:59 UTC (rev 107206)
+++ five.localsitemanager/trunk/src/five/localsitemanager/__init__.py	2009-12-28 11:50:00 UTC (rev 107207)
@@ -15,6 +15,7 @@
 
 from Acquisition import aq_base
 from zope.component.globalregistry import base
+from zope.component.interfaces import ComponentLookupError
 from zope.location.interfaces import ISite
 from five.localsitemanager.registry import PersistentComponents
 from five.localsitemanager.utils import get_parent
@@ -74,4 +75,7 @@
 def update_sitemanager_bases_handler(site, event):
     """After a site is moved, its site manager links have to be updated."""
     if event.newParent is not None:
-        update_sitemanager_bases(site)
+        try:
+            update_sitemanager_bases(site)
+        except ComponentLookupError:
+            pass