From eaf9546d0ef782c7a9026b1b2cd71308b4d6e01f Mon Sep 17 00:00:00 2001 From: Henrik Levkowetz Date: Tue, 13 Oct 2020 10:57:23 +0000 Subject: [PATCH] Fixed a bug in the charset handling of individual parts in multipart email messages in ietf.nomcom.get_body() - Legacy-Id: 18615 --- docker/Dockerfile | 9 +++++++++ ietf/nomcom/utils.py | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 85a477f63..39b4d2bd2 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -108,6 +108,15 @@ RUN apt-get install -qy \ zile \ zlib1g-dev +# Postgresql packages +RUN apt-get install -qy \ + postgresql-11 \ + postgresql-server-dev-11 + +RUN pip install \ + psycopg2 + + # Get the key used to sign the libyang repo RUN wget -nv http://download.opensuse.org/repositories/home:liberouter/Debian_9.0/Release.key RUN apt-key add - < Release.key diff --git a/ietf/nomcom/utils.py b/ietf/nomcom/utils.py index b0d86c35c..bf7263720 100644 --- a/ietf/nomcom/utils.py +++ b/ietf/nomcom/utils.py @@ -437,7 +437,7 @@ def get_body(message): 'plain')] body = [] for part in text_parts: - charset = get_charset(message) + charset = get_charset(part) body.append(get_payload_text(part, default_charset=charset)) return "\n".join(body).strip()