Lubuntu/britney2-ubuntu
8
0
Fork 0
mirror of https://git.launchpad.net/~ubuntu-release/britney/+git/britney2-ubuntu synced 2025-05-13 19:41:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

read_binaries: Use the suite object

Browse Source 
Signed-off-by: Niels Thykier <niels@thykier.net>
This commit is contained in:
Niels Thykier 2018-07-22 10:31:09 +00:00
parent 3e930174ab
commit 0c6314b466
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
britney.py
View File

@ -326,7 +326,7 @@ class Britney(object):
sources = self.read_sources(suite.path) sources = self.read_sources(suite.path)
suite.sources = sources suite.sources = sources
self.sources[suite.name] = sources self.sources[suite.name] = sources
self.binaries[suite.name] = self.read_binaries(suite.path, suite.name, self.options.architectures) self.binaries[suite.name] = self.read_binaries(suite, self.options.architectures)
# compute inverse Testsuite-Triggers: map, unifying all series # compute inverse Testsuite-Triggers: map, unifying all series
self.logger.info('Building inverse testsuite_triggers map') self.logger.info('Building inverse testsuite_triggers map')
@ -904,12 +904,10 @@ class Britney(object):
return packages return packages
def read_binaries(self, basedir, distribution, architectures): def read_binaries(self, suite, architectures):
"""Read the list of binary packages from the specified directory """Read the list of binary packages from the specified directory
This method reads all the binary packages for a given distribution, This method reads all the binary packages for a given suite.
which is expected to be in the directory denoted by the "base_dir"
parameter.
If the "components" config parameter is set, the directory should If the "components" config parameter is set, the directory should
be the "suite" directory of a local mirror (i.e. the one containing be the "suite" directory of a local mirror (i.e. the one containing
@ -930,6 +928,7 @@ class Britney(object):
which maps virtual packages to real packages that provide them. which maps virtual packages to real packages that provide them.
""" """
arch2packages = {} arch2packages = {}
basedir = suite.path
if self.options.components: if self.options.components:
release_file = read_release_file(basedir) release_file = read_release_file(basedir)
@ -938,7 +937,7 @@ class Britney(object):
packages = {} packages = {}
if arch not in listed_archs: if arch not in listed_archs:
self.logger.info("Skipping arch %s for %s: It is not listed in the Release file", self.logger.info("Skipping arch %s for %s: It is not listed in the Release file",
arch, distribution) arch, suite.name)
arch2packages[arch] = ({}, {}) arch2packages[arch] = ({}, {})
continue continue
for component in self.options.components: for component in self.options.components:
@ -958,11 +957,11 @@ class Britney(object):
udeb_filename = possibly_compressed(udeb_filename) udeb_filename = possibly_compressed(udeb_filename)
self._read_packages_file(filename, self._read_packages_file(filename,
arch, arch,
self.sources[distribution], suite.sources,
packages) packages)
self._read_packages_file(udeb_filename, self._read_packages_file(udeb_filename,
arch, arch,
self.sources[distribution], suite.sources,
packages) packages)
# create provides # create provides
provides = create_provides_map(packages) provides = create_provides_map(packages)
@ -972,7 +971,7 @@ class Britney(object):
filename = os.path.join(basedir, "Packages_%s" % arch) filename = os.path.join(basedir, "Packages_%s" % arch)
packages = self._read_packages_file(filename, packages = self._read_packages_file(filename,
arch, arch,
self.sources[distribution]) suite.sources)
provides = create_provides_map(packages) provides = create_provides_map(packages)
arch2packages[arch] = (packages, provides) arch2packages[arch] = (packages, provides)