Encode using utf-8 and hope for the best

Signed-off-by: Mark Hymers <mhy@debian.org>

diff --git a/config/debian/cron.hourly b/config/debian/cron.hourly
index fdbd3bce4003244aa7fcf3468b4818028dff0ba0..0cb5994317b7b2ea2919f800a5f26187cd4b9a76 100755 (executable)
--- a/config/debian/cron.hourly
+++ b/config/debian/cron.hourly
@@ -11,7 +11,7 @@ export SCRIPTVARS=/srv/ftp-master.debian.org/dak/config/debian/vars
 dak import-users-from-passwd
 dak queue-report -n > $webdir/new.html
 dak queue-report -8 -d new,byhand,proposedupdates,oldproposedupdates -r $webdir/stat
-#dak show-deferred -r $webdir/stat > ${webdir}/deferred.html
+dak show-deferred -r $webdir/stat > ${webdir}/deferred.html
 dak graph -n new,byhand,proposedupdates,oldproposedupdates,deferred -r $webdir/stat -i $webdir/stat -x $scriptsdir/rrd-release-freeze-dates
 
 # do not run show-new and other stuff in parallel

diff --git a/dak/show_deferred.py b/dak/show_deferred.py
index dce80987bd3d72238c466bb877fbf3e2a7241659..d19426b14ad7afbd49e06cbc8c6a386fab6bb2ae 100755 (executable)
--- a/dak/show_deferred.py
+++ b/dak/show_deferred.py
@@ -98,7 +98,7 @@ def footer():
      height="31" width="88"></a>
     """
     res += "</body></html>"
-    return res
+    return res.encode('utf-8')
 
 def table_header():
     return """<h1>Deferred uploads</h1>