From 3fca6028098c638a92562995e8bc943eb5d1ff00 Mon Sep 17 00:00:00 2001 From: Andreas Moog Date: Wed, 30 Nov 2011 21:05:17 +0100 Subject: [PATCH] grep-merges: We already require a UTF-8 enabled terminal, so encode package and uploader name in UTF-8 (LP: #694388) --- debian/changelog | 4 +++- grep-merges | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 0737ce4..4e59f5a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -19,8 +19,10 @@ ubuntu-dev-tools (0.137) UNRELEASED; urgency=low [ Andreas Moog ] * sponsor-patch: Check permission to unsubscribe sponsors-team (LP: #896884) + * grep-merges: We already require a UTF-8 enabled terminal, so encode + package and uploader name in UTF-8 (LP: #694388) - -- Andreas Moog Sun, 27 Nov 2011 16:47:05 +0100 + -- Andreas Moog Wed, 30 Nov 2011 21:04:39 +0100 ubuntu-dev-tools (0.136) unstable; urgency=low diff --git a/grep-merges b/grep-merges index 11fb93d..20023a0 100755 --- a/grep-merges +++ b/grep-merges @@ -60,7 +60,7 @@ def main(): pretty_uploader = ' '.join((author, uploader)).strip() if (match is None or match in package or match in author or match in uploader): - print '%s\t%s' % (package, pretty_uploader) + print '%s\t%s' % (package.encode("utf-8"), pretty_uploader.encode("utf-8")) if __name__ == '__main__': main()