Merge lp:~syleam/openobject-server/5.0-fix-import_data-message into lp:openobject-server/5.0

[Christophe CHAUVET]

[Jay Vora (Serpent Consulting Services) (jayvora)]

Not all the exceptions have e[1].

review: Disapprove

Unmerged revisions

1992. By Christophe CHAUVET on 2010-02-26

[FIX] Better error message when a exception cannot from to the database

=== modified file 'bin/osv/orm.py'
--- bin/osv/orm.py	2010-02-25 15:13:44 +0000
+++ bin/osv/orm.py	2010-02-26 18:23:13 +0000
@@ -871,11 +871,10 @@
                             msg = self.pool._sql_error[key]
                             break
                     return (-1, res, 'Line ' + str(counter) +' : ' + msg, '' )
-                if isinstance(e, osv.orm.except_orm ):
+                else:
                     msg = _('Insertion Failed! ' + e[1])
-                    return (-1, res, 'Line ' + str(counter) +' : ' + msg, '' )
-                #Raising Uncaught exception
-                raise
+                    return (-1, res, 'Line ' + str(counter) +' : ' + msg, '')
+
             for lang in translate:
                 context2 = context.copy()
                 context2['lang'] = lang