[PATCH] views: don't duplicate tags in patch message when generating mbox

Andrew Donnellan andrew.donnellan at au1.ibm.com
Wed Nov 23 18:01:31 AEDT 2016


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 at au1.ibm.com>
    Acked-by: Russell Currey <ruscur at russell.cc>

the tags from the original email are duplicated:

    Example patch

    This patch is awesome!

    Signed-off-by: Andrew Donnellan <andrew.donnellan at au1.ibm.com>
    Acked-by: Russell Currey <ruscur at russell.cc>
    Signed-off-by: Andrew Donnellan <andrew.donnellan at au1.ibm.com>
    Acked-by: Russell Currey <ruscur at 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 at russell.cc>
Signed-off-by: Andrew Donnellan <andrew.donnellan at au1.ibm.com>

---

Stephen, does this look correct?
---
 patchwork/views/__init__.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/patchwork/views/__init__.py b/patchwork/views/__init__.py
index a29da83..58fb29f 100644
--- a/patchwork/views/__init__.py
+++ b/patchwork/views/__init__.py
@@ -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
 
-- 
Andrew Donnellan              OzLabs, ADL Canberra
andrew.donnellan at au1.ibm.com  IBM Australia Limited



More information about the Patchwork mailing list