[Checkins] SVN: Products.CMFDefault/trunk/Products/CMFDefault/upgrade/to21.py - tweaking

[Yvo Schubbe]

Log message for revision 130232:
  - tweaking

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	2013-05-08 15:08:34 UTC (rev 130231)
+++ Products.CMFDefault/trunk/Products/CMFDefault/upgrade/to21.py	2013-05-08 15:30:00 UTC (rev 130232)
@@ -261,7 +261,9 @@
 def check_skins_tool(tool):
     """2.0.x to 2.1.0 upgrade step checker
     """
-    stool = getToolByName(tool, 'portal_skins')
+    stool = getToolByName(tool, 'portal_skins', None)
+    if stool is None:
+        return False
     for obj in stool.objectValues():
         if IDirectoryView.providedBy(obj):
             dirpath = obj.getDirPath()
@@ -289,7 +291,9 @@
     """2.0.x to 2.1.0 upgrade step handler
     """
     logger = logging.getLogger('GenericSetup.upgrade')
-    stool = getToolByName(tool, 'portal_skins')
+    stool = getToolByName(tool, 'portal_skins', None)
+    if stool is None:
+        return
     for obj in stool.objectValues():
         if IDirectoryView.providedBy(obj):
             dirpath = obj.getDirPath()