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

debian/bin, debian/lib/python: Delete write-only vars reported by pyflakes

This commit is contained in:
Ben Hutchings 2018-10-01 21:50:59 +01:00
parent 169ec06045
commit 8cafaf07ae
6 changed files with 12 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
debian/bin/abiupdate.py vendored
View File

@ -169,8 +169,6 @@ class Main(object):
self.update_flavour(config, arch, featureset, flavour)
def update_flavour(self, config, arch, featureset, flavour):
config_base = config.merge('base', arch, featureset, flavour)
self.log("Updating ABI for arch %s, featureset %s, flavour %s: " %
(arch, featureset, flavour))
try:

1
debian/bin/gencontrol.py vendored
View File

@ -326,7 +326,6 @@ class Gencontrol(Base):
(arch, makeflags)])
def do_featureset_setup(self, vars, makeflags, arch, featureset, extra):
config_base = self.config.merge('base', arch, featureset)
vars['localversion_headers'] = vars['localversion']
makeflags['LOCALVERSION_HEADERS'] = vars['localversion_headers']

1
debian/changelog vendored
View File

@ -9,6 +9,7 @@ linux (4.19~rc6-1~exp1) UNRELEASED; urgency=medium
* debian/bin, debian/rules.real: Add symlink to Python package directory
instead of editing path
* debian/bin, debian/lib/python: Clean up imports based on pyflakes report
* debian/bin, debian/lib/python: Delete write-only vars reported by pyflakes
-- Ben Hutchings <ben@decadent.org.uk> Thu, 20 Sep 2018 02:40:54 +0100

4
debian/lib/python/debian_linux/config.py vendored
View File

@ -164,8 +164,6 @@ class ConfigCoreHierarchy(object):
config = ConfigParser(self.schema)
config.read(self.get_files(arch, featureset))
flavours = config['base', ].get('flavours', [])
for section in iter(config):
real = (section[-1], arch, featureset) + section[:-1]
s = ret.get(real, {})
@ -208,7 +206,7 @@ class ConfigParser(object):
def __init__(self, schemas):
self.schemas = schemas
self._config = config = RawConfigParser()
self._config = RawConfigParser()
def __getitem__(self, key):
return self._convert()[key]

20
debian/lib/python/debian_linux/debian.py vendored
View File

@ -195,29 +195,29 @@ class _VersionTest(unittest.TestCase):
def test_invalid_epoch(self):
with self.assertRaises(RuntimeError):
v = Version('a:1')
Version('a:1')
with self.assertRaises(RuntimeError):
v = Version('-1:1')
Version('-1:1')
with self.assertRaises(RuntimeError):
v = Version('1a:1')
Version('1a:1')
def test_invalid_upstream(self):
with self.assertRaises(RuntimeError):
v = Version('1_2')
Version('1_2')
with self.assertRaises(RuntimeError):
v = Version('1/2')
Version('1/2')
with self.assertRaises(RuntimeError):
v = Version('a1')
Version('a1')
with self.assertRaises(RuntimeError):
v = Version('1 2')
Version('1 2')
def test_invalid_revision(self):
with self.assertRaises(RuntimeError):
v = Version('1-2_3')
Version('1-2_3')
with self.assertRaises(RuntimeError):
v = Version('1-2/3')
Version('1-2/3')
with self.assertRaises(RuntimeError):
v = Version('1-2:3')
Version('1-2:3')
class VersionLinux(Version):

3
debian/lib/python/debian_linux/gencontrol.py vendored
View File

@ -103,7 +103,6 @@ class Gencontrol(object):
packages['source'] = self.process_package(source, self.vars)
def do_main(self, packages, makefile):
config_entry = self.config['base', ]
vars = self.vars.copy()
makeflags = MakeFlags()
@ -267,8 +266,6 @@ class Gencontrol(object):
def do_flavour(self, packages, makefile, arch, featureset, flavour, vars,
makeflags, extra):
config_base = self.config.merge('base', arch, featureset, flavour)
vars['localversion'] += '-' + flavour
self.do_flavour_setup(vars, makeflags, arch, featureset, flavour,