[Checkins] SVN: Products.CMFDefault/branches/2.2/Products/CMFDefault/upgrade/to21.py - don't raise an error if no root site manager exists

[Yvo Schubbe]

Log message for revision 106406:
  - don't raise an error if no root site manager exists

Changed:
  U   Products.CMFDefault/branches/2.2/Products/CMFDefault/upgrade/to21.py

-=-
Modified: Products.CMFDefault/branches/2.2/Products/CMFDefault/upgrade/to21.py
===================================================================
--- Products.CMFDefault/branches/2.2/Products/CMFDefault/upgrade/to21.py	2009-12-10 15:23:04 UTC (rev 106405)
+++ Products.CMFDefault/branches/2.2/Products/CMFDefault/upgrade/to21.py	2009-12-10 16:12:13 UTC (rev 106406)
@@ -178,12 +178,14 @@
     """2.1.0-beta to 2.1.0 upgrade step checker
     """
     portal = aq_parent(aq_inner(tool))
+    try:
+        # We have to call setSite to make sure we have a site with a proper
+        # acquisition context.
+        setSite(portal)
+        sm = getSiteManager(portal)
+    except ComponentLookupError:
+        return False
 
-    # We have to call setSite to make sure we have a site with a proper
-    # acquisition context.
-    setSite(portal)
-
-    sm = getSiteManager(portal)
     for utility in BAD_UTILITIES:
         iface = resolve(utility)
         if sm.queryUtility(iface) is not None:
@@ -219,8 +221,11 @@
     """2.1.0-alpha to 2.1.0 upgrade step checker
     """
     portal = aq_parent(aq_inner(tool))
-    setSite(portal)
-    sm = getSiteManager(portal)
+    try:
+        setSite(portal)
+        sm = getSiteManager(portal)
+    except ComponentLookupError:
+        return False
 
     for tool_id, tool_interface in _TOOL_UTILITIES:
         tool_obj = getToolByName(portal, tool_id, default=None)