Ticket #6970: 6970.patch

django/db/models/query.py

@@ -316 +316 @@
                 obj.save()
                 return obj, True
             except IntegrityError, e:
-                return self.get(**kwargs), False
+                try:
+                    return self.get(**kwargs), False
+                except self.model.DoesNotExist, e2:
+                    raise e
 
     def latest(self, field_name=None):
         """