diff mbox

parsemail: Ignore multiple cover letters

Message ID 20160715062910.14137-1-ruscur@russell.cc
State Accepted
Headers show

Commit Message

Russell Currey July 15, 2016, 6:29 a.m. UTC
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>
---
 patchwork/bin/parsemail.py | 3 +++
 1 file changed, 3 insertions(+)

Comments

Stephen Finucane July 15, 2016, 12:58 p.m. UTC | #1
On 15 Jul 16:29, Russell Currey wrote:
> 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>

I think this issue is a little more complex than this, involving series
follow ups among other elements. However, this is a good immediate fix.
Applied.

Reviewed-by: Stephen Finucane <stephen.finucane@intel.com>
diff mbox

Patch

diff --git a/patchwork/bin/parsemail.py b/patchwork/bin/parsemail.py
index 8648d29..48f809f 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