From 9a3e6a6c8d4b1857bef0354564e15639bfdc32d4 Mon Sep 17 00:00:00 2001 From: Vincent Pelletier <vincent@nexedi.com> Date: Thu, 10 Jan 2013 13:27:11 +0100 Subject: [PATCH] resolve_path already catches exceptions internaly. --- product/ZSQLCatalog/ZSQLCatalog.py | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/product/ZSQLCatalog/ZSQLCatalog.py b/product/ZSQLCatalog/ZSQLCatalog.py index e67dd7d7f6..adaf7074a7 100644 --- a/product/ZSQLCatalog/ZSQLCatalog.py +++ b/product/ZSQLCatalog/ZSQLCatalog.py @@ -350,12 +350,7 @@ class ZCatalog(Folder, Persistent, Implicit): if catalog == 0: self.uncatalog_object(uid=o.path, sql_catalog_id=sql_catalog_id) elif catalog == 1: - try: - obj = self.resolve_path(o.path) - except ConflictError: - raise - except: - obj = None + obj = self.resolve_path(o.path) if obj is not None: obj.reindexObject(sql_catalog_id=sql_catalog_id) else: -- 2.30.9