From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 18 Jan 2009 19:52:49 +0000 (-0500)
Subject: Avoid feeding decoded unicode to Term::ReadLine
X-Git-Tag: 3.03~66
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=639f464cb3c703697db2a8887ab32d7a8233508f;p=ikiwiki.git

Avoid feeding decoded unicode to Term::ReadLine

That resulted in double encoded display when using perl's stub
readline module. Apparently that module unconditionally upgrades
text to utf8, in a quite braindead way.

(Term::ReadLine::Gnu::Perl worked ok.)
---

diff --git a/IkiWiki/Setup/Automator.pm b/IkiWiki/Setup/Automator.pm
index b7798fcec..42caf3039 100644
--- a/IkiWiki/Setup/Automator.pm
+++ b/IkiWiki/Setup/Automator.pm
@@ -9,12 +9,13 @@ use IkiWiki;
 use IkiWiki::UserInfo;
 use Term::ReadLine;
 use File::Path;
+use Encode;
 
 sub ask ($$) {
 	my ($question, $default)=@_;
 
 	my $r=Term::ReadLine->new("ikiwiki");
-	$r->readline($question." ", $default);
+	$r->readline(encode_utf8($question)." ", $default);
 }
 
 sub prettydir ($) {
diff --git a/debian/changelog b/debian/changelog
index 013dc1884..6e8a54d9d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ikiwiki (3.03) UNRELEASED; urgency=low
+
+  * Avoid feeding decoded unicode to Term::ReadLine.
+    Closes: 512169
+
+ -- Joey Hess <joeyh@debian.org>  Sun, 18 Jan 2009 14:50:57 -0500
+
 ikiwiki (3.02) unstable; urgency=low
 
   * blogspam: New plugin, adding spam filtering for page editing / comment