[Erp5-report] r43028 nicolas - /erp5/trunk/products/ERP5/Document/BusinessTemplate.py

[nobody at svn.erp5.org]

Author: nicolas
Date: Fri Feb  4 11:44:28 2011
New Revision: 43028

URL: http://svn.erp5.org?rev=43028&view=rev
Log:
This Exception prevents user to import BusinessTemplate with file_system property_sheets
(non migrated) into a portal with migrated property_sheets (ZODB).
output a warning message instead and continue
approved by arnaud.

Modified:
    erp5/trunk/products/ERP5/Document/BusinessTemplate.py

Modified: erp5/trunk/products/ERP5/Document/BusinessTemplate.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/BusinessTemplate.py?rev=43028&r1=43027&r2=43028&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/BusinessTemplate.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/BusinessTemplate.py [utf8] Fri Feb  4 11:44:28 2011
@@ -3651,9 +3651,10 @@ class PropertySheetTemplateItem(Document
       # otherwise it should not be needed anymore once the deletion
       # code of the filesystem Property Sheets is enabled
       if class_id in property_sheet_id_set:
-        raise RuntimeError('Conflict when migrating Property Sheet %s: ' \
-                           'already exists in portal_property_sheets' % \
-                           class_id)
+        warn('Conflict when migrating Property Sheet %s: ' \
+             'already exists in portal_property_sheets' % class_id,
+             UserWarning)
+        continue
 
       filesystem_property_sheet_path = \
           self._getFilesystemPropertySheetPath(class_id)