From: Russell Currey <ruscur@russell.cc>
Date: Fri, 15 Jul 2016 06:29:10 +0000 (+1000)
Subject: parsemail: Ignore multiple cover letters
X-Git-Tag: v2.0.0-rc1~298
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=474860887a60d5cef670b81bad566b6976eed558;p=thirdparty%2Fpatchwork.git

parsemail: Ignore multiple cover letters

If multiple cover letters are found, parsemail dies with a
MultipleObjectsReturned exception.  This is particularly problematic in
the middle of a parsearchive run, so just ignore multiple cover letters.

Signed-off-by: Russell Currey <ruscur@russell.cc>
Reviewed-by: Stephen Finucane <stephen.finucane@intel.com>
---

diff --git a/patchwork/bin/parsemail.py b/patchwork/bin/parsemail.py
index 8648d29c..48f809fb 100755
--- a/patchwork/bin/parsemail.py
+++ b/patchwork/bin/parsemail.py
@@ -523,6 +523,9 @@ def parse_mail(mail, list_id=None):
                 CoverLetter.objects.all().get(name=name)
             except CoverLetter.DoesNotExist:  # no match => new cover
                 is_cover_letter = True
+            except CoverLetter.MultipleObjectsReturned:
+                # if multiple cover letters are found, just ignore
+                pass
         else:
             is_cover_letter = True