[Erp5-report] r45184 romain - /erp5/trunk/products/ERP5/Tool/TrashTool.py

[nobody at svn.erp5.org]

Author: romain
Date: Thu Apr  7 17:48:31 2011
New Revision: 45184

URL: http://svn.erp5.org?rev=45184&view=rev
Log:
Cleanup broken BTreeFolder2 which can prevent bt5 installation

Modified:
    erp5/trunk/products/ERP5/Tool/TrashTool.py

Modified: erp5/trunk/products/ERP5/Tool/TrashTool.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Tool/TrashTool.py?rev=45184&r1=45183&r2=45184&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Tool/TrashTool.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Tool/TrashTool.py [utf8] Thu Apr  7 17:48:31 2011
@@ -34,7 +34,7 @@ from Products.ERP5Type.Tool.BaseTool imp
 from Products.ERP5Type import Permissions
 from Products.ERP5 import _dtmldir
 from Products.ERP5.Document.BusinessTemplate import getChainByType
-from zLOG import LOG
+from zLOG import LOG, WARNING
 from DateTime import DateTime
 from Acquisition import aq_base
 
@@ -143,6 +143,11 @@ class TrashTool(BaseTool):
           subobjects_dict[subobject_id] = subobject_copy
           if save: # remove subobjecs from backup object
             obj._delObject(subobject_id)
+            if subobject_id in obj.objectIds():
+              LOG('Products.ERP5.Tool.TrashTool', WARNING,
+                  'Cleaning corrupted BTreeFolder2 object at %r.' % \
+                                                       (subobject_path,))
+              obj._cleanup()
     return subobjects_dict
 
   def newTrashBin(self, bt_title='trash', bt=None):