debian-packaging
/
linux
8
0
Fork 0
Code Releases Activity

Fix pycodestyle "line break after binary operator" warnings

This commit is contained in:
Ben Hutchings 2018-12-28 15:27:54 +00:00
parent 32af5cef75
commit a54c09f109
6 changed files with 33 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
debian/bin/abiupdate.py vendored
View File

@ -33,22 +33,22 @@ class url_debian_pool(object):
self.base = base self.base = base
def __call__(self, source, filename, arch): def __call__(self, source, filename, arch):
return (self.base + "pool/main/" + source[0] + "/" + source + "/" + return (self.base + "pool/main/" + source[0] + "/" + source + "/"
filename) + filename)
class url_debian_ports_pool(url_debian_pool): class url_debian_ports_pool(url_debian_pool):
def __call__(self, source, filename, arch): def __call__(self, source, filename, arch):
if arch == 'all': if arch == 'all':
return url_debian_pool.__call__(self, source, filename, arch) return url_debian_pool.__call__(self, source, filename, arch)
return (self.base + "pool-" + arch + "/main/" + source[0] + "/" + return (self.base + "pool-" + arch + "/main/" + source[0] + "/"
source + "/" + filename) + source + "/" + filename)
class url_debian_security_pool(url_debian_pool): class url_debian_security_pool(url_debian_pool):
def __call__(self, source, filename, arch): def __call__(self, source, filename, arch):
return (self.base + "pool/updates/main/" + source[0] + "/" + source + return (self.base + "pool/updates/main/" + source[0] + "/" + source
"/" + filename) + "/" + filename)
class Main(object): class Main(object):
@ -107,8 +107,8 @@ class Main(object):
def get_abi(self, arch, prefix): def get_abi(self, arch, prefix):
try: try:
version_abi = (self.config[('version',)]['abiname_base'] + '-' + version_abi = (self.config[('version',)]['abiname_base'] + '-'
self.config['abi', arch]['abiname']) + self.config['abi', arch]['abiname'])
except KeyError: except KeyError:
version_abi = self.version_abi version_abi = self.version_abi
filename = ("linux-headers-%s-%s_%s_%s.deb" % filename = ("linux-headers-%s-%s_%s_%s.deb" %

4
debian/bin/buildcheck.py vendored
View File

@ -44,8 +44,8 @@ class CheckAbi(object):
self.filename_new = "%s/Module.symvers" % dir self.filename_new = "%s/Module.symvers" % dir
try: try:
version_abi = (self.config[('version',)]['abiname_base'] + '-' + version_abi = (self.config[('version',)]['abiname_base'] + '-'
self.config['abi', arch]['abiname']) + self.config['abi', arch]['abiname'])
except KeyError: except KeyError:
version_abi = self.config[('version',)]['abiname'] version_abi = self.config[('version',)]['abiname']
self.filename_ref = ("debian/abi/%s/%s_%s_%s" % self.filename_ref = ("debian/abi/%s/%s_%s_%s" %

12
debian/bin/gencontrol.py vendored
View File

@ -361,14 +361,14 @@ class Gencontrol(Base):
config_image = self.config.merge('image', arch, featureset, flavour) config_image = self.config.merge('image', arch, featureset, flavour)
vars['class'] = config_description['hardware'] vars['class'] = config_description['hardware']
vars['longclass'] = (config_description.get('hardware-long') or vars['longclass'] = (config_description.get('hardware-long')
vars['class']) or vars['class'])
vars['localversion-image'] = vars['localversion'] vars['localversion-image'] = vars['localversion']
override_localversion = config_image.get('override-localversion', None) override_localversion = config_image.get('override-localversion', None)
if override_localversion is not None: if override_localversion is not None:
vars['localversion-image'] = (vars['localversion_headers'] + '-' + vars['localversion-image'] = (vars['localversion_headers'] + '-'
override_localversion) + override_localversion)
vars['image-stem'] = config_image.get('install-stem') vars['image-stem'] = config_image.get('install-stem')
self._setup_makeflags(self.flavour_makeflags_base, makeflags, self._setup_makeflags(self.flavour_makeflags_base, makeflags,
@ -638,8 +638,8 @@ class Gencontrol(Base):
self.config['version', ] = {'source': self.version.complete, self.config['version', ] = {'source': self.version.complete,
'upstream': self.version.linux_upstream, 'upstream': self.version.linux_upstream,
'abiname_base': self.abiname_version, 'abiname_base': self.abiname_version,
'abiname': (self.abiname_version + 'abiname': (self.abiname_version
self.abiname_part)} + self.abiname_part)}
distribution = self.changelog[0].distribution distribution = self.changelog[0].distribution
if distribution in ('unstable', ): if distribution in ('unstable', ):

26
debian/bin/gencontrol_signed.py vendored
View File

@ -44,11 +44,11 @@ class Gencontrol(Base):
} }
self.package_dir = 'debian/%(template)s' % self.vars self.package_dir = 'debian/%(template)s' % self.vars
self.template_top_dir = (self.package_dir + self.template_top_dir = (self.package_dir
'/usr/share/code-signing/%(template)s' % + '/usr/share/code-signing/%(template)s'
self.vars) % self.vars)
self.template_debian_dir = (self.template_top_dir + self.template_debian_dir = (self.template_top_dir
'/source-template/debian') + '/source-template/debian')
os.makedirs(self.template_debian_dir, exist_ok=True) os.makedirs(self.template_debian_dir, exist_ok=True)
self.image_packages = [] self.image_packages = []
@ -184,8 +184,8 @@ class Gencontrol(Base):
cert_file_name)) cert_file_name))
packages['source']['Build-Depends'].append( packages['source']['Build-Depends'].append(
image_package_name + image_package_name
' (= %(imagebinaryversion)s) [%(arch)s]' % vars) + ' (= %(imagebinaryversion)s) [%(arch)s]' % vars)
packages_signed = self.process_packages( packages_signed = self.process_packages(
self.templates['control.image'], vars) self.templates['control.image'], vars)
@ -209,14 +209,14 @@ class Gencontrol(Base):
os.makedirs(self.package_dir + '/usr/share/lintian/overrides', 0o755, os.makedirs(self.package_dir + '/usr/share/lintian/overrides', 0o755,
exist_ok=True) exist_ok=True)
with open(self.package_dir + with open(self.package_dir
'/usr/share/lintian/overrides/%(template)s' % self.vars, + '/usr/share/lintian/overrides/%(template)s' % self.vars,
'a') as lintian_overrides: 'a') as lintian_overrides:
for script_base in ['postinst', 'postrm', 'preinst', 'prerm']: for script_base in ['postinst', 'postrm', 'preinst', 'prerm']:
script_name = (self.template_debian_dir + script_name = (self.template_debian_dir
'/linux-image-%s%s.%s' % + '/linux-image-%s%s.%s'
(vars['abiname'], vars['localversion'], % (vars['abiname'], vars['localversion'],
script_base)) script_base))
self._substitute_file('image.%s' % script_base, vars, self._substitute_file('image.%s' % script_base, vars,
script_name) script_name)
lintian_overrides.write('%s: script-not-executable %s\n' % lintian_overrides.write('%s: script-not-executable %s\n' %

1
debian/changelog vendored
View File

@ -14,6 +14,7 @@ linux (4.19.12-2) UNRELEASED; urgency=medium
* [powerpcspe] Fix -mcpu= options for SPE-only compiler * [powerpcspe] Fix -mcpu= options for SPE-only compiler
* debian/lib/python/debian_linux/debian.py: Fix deprecated import of * debian/lib/python/debian_linux/debian.py: Fix deprecated import of
MutableSet MutableSet
* Fix pycodestyle "line break after binary operator" warnings
[ Salvatore Bonaccorso ] [ Salvatore Bonaccorso ]
* USB: hso: Fix OOB memory access in hso_probe/hso_get_config_data * USB: hso: Fix OOB memory access in hso_probe/hso_get_config_data

6
debian/lib/python/debian_linux/firmware.py vendored
View File

@ -79,9 +79,9 @@ class FirmwareWhence(list):
else: else:
licence = value licence = value
elif licence is not None: elif licence is not None:
licence = (licence + '\n' + licence = (licence + '\n'
re.sub(r'^(?:[/ ]\*| \*/)?\s*(.*?)\s*$', r'\1', + re.sub(r'^(?:[/ ]\*| \*/)?\s*(.*?)\s*$', r'\1',
line)) line))
# Finish last section if non-empty # Finish last section if non-empty
for b in binary: for b in binary: