Commit 35700e42 authored by Christophe Dumez's avatar Christophe Dumez

- Fixed bug #447: BT Uninstall fails if a folder/file is already removed


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@9150 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent a9c117ef
......@@ -62,6 +62,7 @@ from OFS import XMLExportImport
from cStringIO import StringIO
from copy import deepcopy
from App.config import getConfiguration
from zExceptions import BadRequest
import OFS.XMLExportImport
customImporters={
XMLExportImport.magic: XMLExportImport.importXML,
......@@ -681,7 +682,7 @@ class ObjectTemplateItem(BaseTemplateItem):
if trash and trashbin is not None:
self.portal_trash.backupObject(trashbin, container_path, object_id, save=1, keep_subobjects=1)
container.manage_delObjects([object_id])
except (NotFound, KeyError):
except (NotFound, KeyError, BadRequest):
# object is already backup and/or removed
pass
BaseTemplateItem.uninstall(self, context, **kw)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment