[Checkins] SVN: Products.CMFDefault/trunk/Products/CMFDefault/upgrade/to21.py - don't fail if CMFCalendar is not installed
Yvo Schubbe
y.2009 at wcm-solutions.de
Thu Dec 10 11:44:03 EST 2009
Log message for revision 106417:
- don't fail if CMFCalendar is not installed
Changed:
U Products.CMFDefault/trunk/Products/CMFDefault/upgrade/to21.py
-=-
Modified: Products.CMFDefault/trunk/Products/CMFDefault/upgrade/to21.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/upgrade/to21.py 2009-12-10 16:43:49 UTC (rev 106416)
+++ Products.CMFDefault/trunk/Products/CMFDefault/upgrade/to21.py 2009-12-10 16:44:03 UTC (rev 106417)
@@ -187,7 +187,11 @@
return False
for utility in BAD_UTILITIES:
- iface = resolve(utility)
+ try:
+ iface = resolve(utility)
+ except ImportError:
+ continue
+
if sm.queryUtility(iface) is not None:
return True
@@ -205,7 +209,11 @@
sm = getSiteManager(portal)
for dotted_path in BAD_UTILITIES:
- iface = resolve(dotted_path)
+ try:
+ iface = resolve(dotted_path)
+ except ImportError:
+ continue
+
if sm.queryUtility(iface) is not None:
sm.unregisterUtility(provided=iface)
logger.info('Unregistered utility for %s' % dotted_path)
More information about the checkins
mailing list