diff --git a/debian/bin/gencontrol.py b/debian/bin/gencontrol.py index 9e7a27342..df430536e 100755 --- a/debian/bin/gencontrol.py +++ b/debian/bin/gencontrol.py @@ -3,7 +3,7 @@ import sys sys.path.append("debian/lib/python") -import codecs +import locale import errno import glob import io @@ -11,6 +11,8 @@ import os import os.path import subprocess +locale.setlocale(locale.LC_CTYPE, "C.UTF-8") + from debian_linux import config from debian_linux.debian import * from debian_linux.gencontrol import Gencontrol as Base, merge_packages @@ -62,7 +64,7 @@ class Gencontrol(Base): makeflags[dst] = data[src] def _substitute_file(self, template, vars, target, append=False): - with codecs.open(target, 'a' if append else 'w', 'utf-8') as f: + with open(target, 'a' if append else 'w') as f: f.write(self.substitute(self.templates[template], vars)) def do_main_setup(self, vars, makeflags, extra): @@ -237,9 +239,9 @@ class Gencontrol(Base): stdout=subprocess.PIPE, env=kw_env) if not isinstance(kw_proc.stdout, io.IOBase): - udeb_packages = read_control(io.open(kw_proc.stdout.fileno(), encoding='utf-8', closefd=False)) + udeb_packages = read_control(io.open(kw_proc.stdout.fileno(), closefd=False)) else: - udeb_packages = read_control(io.TextIOWrapper(kw_proc.stdout, 'utf-8')) + udeb_packages = read_control(io.TextIOWrapper(kw_proc.stdout)) kw_proc.wait() if kw_proc.returncode != 0: raise RuntimeError('kernel-wedge exited with code %d' % @@ -573,7 +575,7 @@ class Gencontrol(Base): f.close() def write_tests_control(self): - self.write_rfc822(codecs.open("debian/tests/control", 'w', 'utf-8'), + self.write_rfc822(open("debian/tests/control", 'w'), [self.tests_control]) if __name__ == '__main__': diff --git a/debian/changelog b/debian/changelog index 34be3d5c1..f05b57410 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ linux (4.14~rc5-1~exp2) UNRELEASED; urgency=medium * [mips*] Increase RELOCATION_TABLE_SIZE to 0x00120000 (fixes FTBFS) + * debian/bin/gencontrol.py: Set encoding to UTF-8 globally -- Ben Hutchings Fri, 20 Oct 2017 00:20:35 +0100