[Erp5-report] r42938 arnaud.fontaine - /erp5/trunk/products/ERP5Type/Tool/PropertySheetTool.py

[nobody at svn.erp5.org]

Author: arnaud.fontaine
Date: Wed Feb  2 16:24:18 2011
New Revision: 42938

URL: http://svn.erp5.org?rev=42938&view=rev
Log:
Do not fail to migrate a filesystem Property Sheet to ZODB if some
constraints have not been migrated yet, just ignore them for now

Modified:
    erp5/trunk/products/ERP5Type/Tool/PropertySheetTool.py

Modified: erp5/trunk/products/ERP5Type/Tool/PropertySheetTool.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/Tool/PropertySheetTool.py?rev=42938&r1=42937&r2=42938&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/Tool/PropertySheetTool.py [utf8] (original)
+++ erp5/trunk/products/ERP5Type/Tool/PropertySheetTool.py [utf8] Wed Feb  2 16:24:18 2011
@@ -39,7 +39,7 @@ from Products.CMFCore.Expression import 
 
 from Products.ERP5Type.dynamic.accessor_holder import AccessorHolderType
 
-from zLOG import LOG, ERROR, INFO
+from zLOG import LOG, ERROR, INFO, WARNING
 
 class PropertySheetTool(BaseTool):
   """
@@ -146,7 +146,18 @@ class PropertySheetTool(BaseTool):
     portal_type_dict.update(self._merged_portal_type_dict)
 
     for constraint in getattr(klass, '_constraints', ()):
-      portal_type = portal_type_dict[constraint['type']]
+      try:
+        portal_type = portal_type_dict[constraint['type']]
+      except KeyError:
+        # TODO: Constraints without Portal Type yet (e.g. Constraints
+        # which have not been migrated yet (within BTs or per-project
+        # Products)) are simply *ignored* for now
+        LOG("Tool.PropertySheetTool", WARNING,
+            "Not migrating constraint %s to portal_property_sheets" % \
+            constraint['type'])
+
+        continue
+
       portal_type_class = types_tool.getPortalTypeClass(portal_type)
 
       # Create the new constraint