diff options
| author | Étienne Loks <etienne.loks@proxience.com> | 2015-11-25 17:11:21 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@proxience.com> | 2015-11-25 17:11:21 +0100 |
| commit | a5f26c1d33e57b2fa470db829fb76105cddfa89a (patch) | |
| tree | 2e9a532ebfc4a6a5c80b8400e457159a914d618e /ishtar_common/data_importer.py | |
| parent | 57a24d859ed35f2faaea07e0d89f83eaebcc57af (diff) | |
| download | Ishtar-a5f26c1d33e57b2fa470db829fb76105cddfa89a.tar.bz2 Ishtar-a5f26c1d33e57b2fa470db829fb76105cddfa89a.zip | |
Archaeological operations: common_name -> text - data migration: report error on abuse associations
Diffstat (limited to 'ishtar_common/data_importer.py')
| -rw-r--r-- | ishtar_common/data_importer.py | 5 |
1 files changed, 3 insertions, 2 deletions
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): |