Skip to content

erp5
erp5
Commit 9a3e6a6c authored by Vincent Pelletier's avatar Vincent Pelletier
Browse files
Options

resolve_path already catches exceptions internaly.

parent cfaaa32b
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 6 deletions
product/ZSQLCatalog/ZSQLCatalog.py
View file @ 9a3e6a6c
...@@ -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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7