Repository :
http://git.fedorahosted.org/cgit/copr.git
On branch : master
---------------------------------------------------------------
commit 5b02d9d9fa0ec1ba887291544071047f238b050a
Author: Igor Gnatenko <i.gnatenko.brain(a)gmail.com>
Date: Wed Jan 22 04:32:57 2014 +0400
1054082 - general: encode to utf8 if err in mimetext
Reference:
https://bugzilla.redhat.com/show_bug.cgi?id=1054082
Signed-off-by: Igor Gnatenko <i.gnatenko.brain(a)gmail.com>
---------------------------------------------------------------
.../coprs/views/coprs_ns/coprs_general.py | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/coprs_frontend/coprs/views/coprs_ns/coprs_general.py
b/coprs_frontend/coprs/views/coprs_ns/coprs_general.py
index 1973ae5..26e6a8f 100644
--- a/coprs_frontend/coprs/views/coprs_ns/coprs_general.py
+++ b/coprs_frontend/coprs/views/coprs_ns/coprs_general.py
@@ -298,7 +298,10 @@ def copr_legal_flag(username, coprname):
navigate_to = "\nNavigate to http://%s%s" % (hostname,
flask.url_for('admin_ns.legal_flag'))
contact = "\nContact on owner is: %s <%s>" % (username,
copr.owner.mail)
reported_by = "\nReported by %s <%s>" % (flask.g.user.name,
flask.g.user.mail)
- msg = MIMEText(form.comment.data + navigate_to + contact + reported_by)
+ try:
+ msg = MIMEText(form.comment.data + navigate_to + contact + reported_by,
"plain")
+ except UnicodeEncodeError:
+ msg = MIMEText(form.comment.data.encode('utf-8') + navigate_to + contact
+ reported_by, "plain", "utf-8")
msg['Subject'] = 'Legal flag raised on %s' % coprname
msg['From'] = 'root@%s' % hostname
msg['To'] = ', '.join(send_to)