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

[nobody at svn.erp5.org]

Author: nicolas
Date: Fri Feb  4 11:54:13 2011
New Revision: 43032

URL: http://svn.erp5.org?rev=43032&view=rev
Log:
Change warning message to tell how this situation serious is.
Add a comment to suggest a solution.

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=43032&r1=43031&r2=43032&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/BusinessTemplate.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/BusinessTemplate.py [utf8] Fri Feb  4 11:54:13 2011
@@ -3651,8 +3651,11 @@ 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:
+        # XXX an Conduit must be able to merge modifications
+        # from FS PropertySheets into ZODB PropertySheets
         warn('Conflict when migrating Property Sheet %s: ' \
-             'already exists in portal_property_sheets' % class_id,
+             'already exists in portal_property_sheets and '\
+             'cannot be updated automatically for now. ' % class_id,
              UserWarning)
         continue