Commit 9a3e6a6c authored by Vincent Pelletier's avatar Vincent Pelletier

resolve_path already catches exceptions internaly.

parent cfaaa32b
...@@ -350,12 +350,7 @@ class ZCatalog(Folder, Persistent, Implicit): ...@@ -350,12 +350,7 @@ class ZCatalog(Folder, Persistent, Implicit):
if catalog == 0: if catalog == 0:
self.uncatalog_object(uid=o.path, sql_catalog_id=sql_catalog_id) self.uncatalog_object(uid=o.path, sql_catalog_id=sql_catalog_id)
elif catalog == 1: elif catalog == 1:
try:
obj = self.resolve_path(o.path) obj = self.resolve_path(o.path)
except ConflictError:
raise
except:
obj = None
if obj is not None: if obj is not None:
obj.reindexObject(sql_catalog_id=sql_catalog_id) obj.reindexObject(sql_catalog_id=sql_catalog_id)
else: else:
......
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