From a3c0248a10c5ddbe9a34f76b995fbf10c34e87f5 Mon Sep 17 00:00:00 2001
From: Toshio Kuratomi <toshio@fedoraproject.org>
Date: Fri, 20 Aug 2010 11:17:43 -0400
Subject: [PATCH] Fix Unicode traceback with notification email.

---
 builder/kojid |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/builder/kojid b/builder/kojid
index 2f7f480..77ded36 100755
--- a/builder/kojid
+++ b/builder/kojid
@@ -3455,7 +3455,10 @@ Status: %(status)s\r
 
         message = self.message_templ % locals()
         # ensure message is in UTF-8
-        message = message.encode('utf-8')
+        if isinstance(message, unicode):
+            message = message.encode('utf-8')
+        else:
+            message = unicode(message, encoding='utf8', errors='replace').encode('utf8')
 
         server = smtplib.SMTP(options.smtphost)
         #server.set_debuglevel(True)
-- 
1.7.2.1