grep-merges: Use UTF-8 encoding

This commit is contained in:
Christopher James Halse Rogers 2011-12-02 12:15:27 +11:00
commit 88fe0e1bb8
2 changed files with 4 additions and 2 deletions

4
debian/changelog vendored
View File

@ -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 <amoog@ubuntu.com> Sun, 27 Nov 2011 16:47:05 +0100
-- Andreas Moog <amoog@ubuntu.com> Wed, 30 Nov 2011 21:04:39 +0100
ubuntu-dev-tools (0.136) unstable; urgency=low

View File

@ -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()