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 8648d29c909790938302a272a7a233013dcc5315..48f809fb8d337847cb03933635c74bfd977ce5eb 100755 (executable)
--- 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