]> git.ipfire.org Git - thirdparty/patchwork.git/commitdiff
views: don't duplicate tags in patch message when generating mbox
authorAndrew Donnellan <andrew.donnellan@au1.ibm.com>
Wed, 23 Nov 2016 07:01:31 +0000 (18:01 +1100)
committerStephen Finucane <stephen@that.guru>
Thu, 24 Nov 2016 20:14:27 +0000 (20:14 +0000)
When generating an mbox for a patch with tags in the original commit
message, e.g.:

    Example patch

    This patch is awesome!

Signed-off-by: Andrew Donnellan <andrew.donnellan@au1.ibm.com>
Acked-by: Russell Currey <ruscur@russell.cc>
the tags from the original email are duplicated:

    Example patch

    This patch is awesome!

Signed-off-by: Andrew Donnellan <andrew.donnellan@au1.ibm.com>
Acked-by: Russell Currey <ruscur@russell.cc>
Signed-off-by: Andrew Donnellan <andrew.donnellan@au1.ibm.com>
Acked-by: Russell Currey <ruscur@russell.cc>
It appears that during the refactoring in ef56359fb776 ("models: Merge
patch and first comment"), we added a call to patch.patch_responses() to
extract the tags from the initial patch email, which we then append to the
patch email body... which already has the tags in it.

Remove the unnecessary append of patch.patch_responses when generating an
mbox.

Fixes: ef56359fb776 ("models: Merge patch and first comment")
Reported-by: Russell Currey <ruscur@russell.cc>
Signed-off-by: Andrew Donnellan <andrew.donnellan@au1.ibm.com>
Reviewed-by: Daniel Axtens <dja@axtens.net>
Reviewed-by: Stephen Finucane <stephen@that.guru>
patchwork/views/__init__.py

index a29da837a2465466b3b287a0035871a5aba4259b..58fb29f8209903b90967ca778608906d062ee679 100644 (file)
@@ -368,8 +368,6 @@ def patch_to_mbox(patch):
         postscript = ''
 
     # TODO(stephenfin): Make this use the tags infrastructure
-    body += patch.patch_responses
-
     for comment in Comment.objects.filter(submission=patch):
         body += comment.patch_responses