Merge pull request #1998 from mkurek/squash-migrations

handle target object does not exist in imported obj
allegro · Nov 26, 2015 · 4963cea · 4963cea
2 parents 4fbcdfb + b63e24b
commit 4963cea
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/src/ralph/data_importer/models.py b/src/ralph/data_importer/models.py
@@ -36,7 +36,12 @@ def get_object_from_old_pk(cls, model, old_pk):
         except cls.DoesNotExist:
             raise ImportedObjectDoesNotExist()
         else:
-            return model.objects.get(id=imported_obj.object_pk)
+            try:
+                return model.objects.get(id=imported_obj.object_pk)
+            except model.DoesNotExist:
+                raise ImportedObjectDoesNotExist(
+                    'Target object does not exist (it was probably removed)'
+                )
 
     @classmethod
     def create(cls, obj, old_pk):