debian/bin/buildcheck.py, debian/bin/gencontrol.py: Support Python 3
svn path=/dists/trunk/linux/; revision=21047
This commit is contained in:
parent
373d086904
commit
4295eeaea6
|
@ -214,7 +214,7 @@ class Main(object):
|
||||||
def __init__(self, dir, arch, featureset, flavour):
|
def __init__(self, dir, arch, featureset, flavour):
|
||||||
self.args = dir, arch, featureset, flavour
|
self.args = dir, arch, featureset, flavour
|
||||||
|
|
||||||
self.config = ConfigCoreDump(fp=file("debian/config.defines.dump"))
|
self.config = ConfigCoreDump(open("debian/config.defines.dump", "rb"))
|
||||||
|
|
||||||
def __call__(self):
|
def __call__(self):
|
||||||
fail = 0
|
fail = 0
|
||||||
|
|
|
@ -6,6 +6,7 @@ sys.path.append("debian/lib/python")
|
||||||
import codecs
|
import codecs
|
||||||
import errno
|
import errno
|
||||||
import glob
|
import glob
|
||||||
|
import io
|
||||||
import os
|
import os
|
||||||
import os.path
|
import os.path
|
||||||
import subprocess
|
import subprocess
|
||||||
|
@ -180,7 +181,10 @@ class Gencontrol(Base):
|
||||||
['kernel-wedge', 'gen-control', vars['abiname']],
|
['kernel-wedge', 'gen-control', vars['abiname']],
|
||||||
stdout=subprocess.PIPE,
|
stdout=subprocess.PIPE,
|
||||||
env=kw_env)
|
env=kw_env)
|
||||||
udeb_packages = read_control(kw_proc.stdout)
|
if not isinstance(kw_proc.stdout, io.IOBase):
|
||||||
|
udeb_packages = read_control(io.open(kw_proc.stdout.fileno(), encoding='utf-8', closefd=False))
|
||||||
|
else:
|
||||||
|
udeb_packages = read_control(io.TextIOWrapper(kw_proc.stdout, 'utf-8'))
|
||||||
kw_proc.wait()
|
kw_proc.wait()
|
||||||
if kw_proc.returncode != 0:
|
if kw_proc.returncode != 0:
|
||||||
raise RuntimeError('kernel-wedge exited with code %d' %
|
raise RuntimeError('kernel-wedge exited with code %d' %
|
||||||
|
@ -489,7 +493,7 @@ class Gencontrol(Base):
|
||||||
|
|
||||||
def process_real_image(self, entry, fields, vars):
|
def process_real_image(self, entry, fields, vars):
|
||||||
entry = self.process_package(entry, vars)
|
entry = self.process_package(entry, vars)
|
||||||
for key, value in fields.iteritems():
|
for key, value in fields.items():
|
||||||
if key in entry:
|
if key in entry:
|
||||||
real = entry[key]
|
real = entry[key]
|
||||||
real.extend(value)
|
real.extend(value)
|
||||||
|
@ -502,7 +506,7 @@ class Gencontrol(Base):
|
||||||
super(Gencontrol, self).write(packages, makefile)
|
super(Gencontrol, self).write(packages, makefile)
|
||||||
|
|
||||||
def write_config(self):
|
def write_config(self):
|
||||||
f = file("debian/config.defines.dump", 'w')
|
f = open("debian/config.defines.dump", 'wb')
|
||||||
self.config.dump(f)
|
self.config.dump(f)
|
||||||
f.close()
|
f.close()
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue