@@ -1220,7 +1220,10 @@ def parse_mail(mail, list_id=None):
SeriesReference.objects.create(
msgid=msgid, project=project, series=series)
- try:
+ with transaction.atomic():
+ if CoverLetter.objects.filter(project=project, msgid=msgid):
+ raise DuplicateMailError(msgid=msgid)
+
cover_letter = CoverLetter.objects.create(
msgid=msgid,
project=project,
@@ -1229,8 +1232,6 @@ def parse_mail(mail, list_id=None):
headers=headers,
submitter=author,
content=message)
- except IntegrityError:
- raise DuplicateMailError(msgid=msgid)
logger.debug('Cover letter saved')
@@ -21,6 +21,7 @@ from patchwork.models import Comment
from patchwork.models import Patch
from patchwork.models import Person
from patchwork.models import State
+from patchwork.models import CoverLetter
from patchwork.parser import clean_subject
from patchwork.parser import get_or_create_author
from patchwork.parser import find_patch_content as find_content
@@ -1134,3 +1135,12 @@ class DuplicateMailTest(TestCase):
self.assertEqual(Patch.objects.count(), 1)
self.assertEqual(Comment.objects.count(), 1)
+
+ def test_duplicate_coverletter(self):
+ m = create_email('test', listid=self.listid, msgid='1@example.com')
+ del m['Subject']
+ m['Subject'] = '[PATCH 0/1] test cover letter'
+
+ self._test_duplicate_mail(m)
+
+ self.assertEqual(CoverLetter.objects.count(), 1)
As we've done for the Patch and Comment models, this change prevents database errors from duplicate CoverLetters. Signed-off-by: Jeremy Kerr <jk@ozlabs.org> --- patchwork/parser.py | 7 ++++--- patchwork/tests/test_parser.py | 10 ++++++++++ 2 files changed, 14 insertions(+), 3 deletions(-)