[Erp5-report] r29679 - /erp5/trunk/products/ZSQLCatalog/ZSQLCatalog.py

[nobody at svn.erp5.org]

Author: vincent
Date: Thu Oct 15 16:12:37 2009
New Revision: 29679

URL: http://svn.erp5.org?rev=29679&view=rev
Log:
Remove a "try..except" block which only raises in all its "except" blocks.

Modified:
    erp5/trunk/products/ZSQLCatalog/ZSQLCatalog.py

Modified: erp5/trunk/products/ZSQLCatalog/ZSQLCatalog.py
URL: http://svn.erp5.org/erp5/trunk/products/ZSQLCatalog/ZSQLCatalog.py?rev=29679&r1=29678&r2=29679&view=diff
==============================================================================
--- erp5/trunk/products/ZSQLCatalog/ZSQLCatalog.py [utf8] (original)
+++ erp5/trunk/products/ZSQLCatalog/ZSQLCatalog.py [utf8] Thu Oct 15 16:12:37 2009
@@ -781,17 +781,10 @@
         goto_current_catalog = 1
 
       if goto_current_catalog:
-        try:
-          # wrap object only when sure it will be reindex now
-          # thus security uid is also reindex
-          wrap_obj = self.wrapObject(obj, sql_catalog_id=sql_catalog_id)
-          wrapped_object_list.append(wrap_obj)
-        except ConflictError:
-          raise
-        except:
-          raise
-          LOG('WARNING ZSQLCatalog', 0, 'wrapObject failed on the object %r' % (obj,), error=sys.exc_info())
-          failed_object_list.append(obj) # XXX Strange JPS - why LOG and keep on ?? wrap_obj not defined
+        # wrap object only when sure it will be reindex now
+        # thus security uid is also reindex
+        wrap_obj = self.wrapObject(obj, sql_catalog_id=sql_catalog_id)
+        wrapped_object_list.append(wrap_obj)
 
     # run activity or execute for each archive depending on priority
     if len(catalog_dict):