From a5f26c1d33e57b2fa470db829fb76105cddfa89a Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Wed, 25 Nov 2015 17:11:21 +0100 Subject: Archaeological operations: common_name -> text - data migration: report error on abuse associations --- ishtar_common/data_importer.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'ishtar_common/data_importer.py') diff --git a/ishtar_common/data_importer.py b/ishtar_common/data_importer.py index acefd9262..34f8ebec8 100644 --- a/ishtar_common/data_importer.py +++ b/ishtar_common/data_importer.py @@ -1345,11 +1345,12 @@ class Importer(object): raise IntegrityError(e.message) except DatabaseError as e: raise IntegrityError(e.message) - except cls.MultipleObjectsReturned: + except cls.MultipleObjectsReturned as e: created = False if 'defaults' in dct: dct.pop('defaults') - obj = cls.objects.filter(**dct).all()[0] + raise IntegrityError(e.message) + # obj = cls.objects.filter(**dct).all()[0] for attr, value in m2ms: values = [value] if type(value) in (list, tuple): -- cgit v1.2.3