From: Yuri Volchkov Date: Mon, 7 May 2018 15:57:55 +0000 (+1000) Subject: skip original Content-Transfer-Encoding for mbox X-Git-Tag: v2.1.0-rc2~17 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6b10927e3e5294a33e82240a6c2f10eeca9c257f;p=thirdparty%2Fpatchwork.git skip original Content-Transfer-Encoding for mbox In the commit 01b9cbb9 all original mail headers are copied into the resulted mbox file. This means that some headers are going to be present twice in the generated mbox. That is fine unless the original email arrived in base64 encoding. Apparently git relies on the latest Content-Transfer-Encoding key. And since downloaded patch's actual encoding is '7bit', git fails to apply it with the message 'Patch is empty'. Since patchwork adds a proper 'Content-Transfer-Encoding' anyways, let's skip this field while copying headers from the original mail Signed-off-by: Yuri Volchkov Acked-by: Veronika Kabatova Reviewed-by: Stephen Finucane --- diff --git a/patchwork/views/utils.py b/patchwork/views/utils.py index f5ff43c1..2357ab86 100644 --- a/patchwork/views/utils.py +++ b/patchwork/views/utils.py @@ -99,6 +99,8 @@ def _submission_to_mbox(submission): orig_headers = HeaderParser().parsestr(str(submission.headers)) for key, val in orig_headers.items(): + if key == 'Content-Transfer-Encoding': + continue mail[key] = val if 'Date' not in mail: