Lubuntu
/
britney2-ubuntu
mirror of https://git.launchpad.net/~ubuntu-release/britney/+git/britney2-ubuntu
8
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Unfold the suite.binaries tuple into two members

Browse Source 
Signed-off-by: Niels Thykier <niels@thykier.net>
ubuntu/rebased
Niels Thykier 6 years ago
parent 9c606ef533
commit 6c5300d873
No known key found for this signature in database
GPG Key ID: A65B78DBE67C7AAC
6 changed files with 72 additions and 58 deletions
Show Stats Download Patch File Download Diff File

77
britney.py
Unescape View File

@ -325,7 +325,7 @@ class Britney(object):
for suite in self.suite_info: for suite in self.suite_info:
sources = self.read_sources(suite.path) sources = self.read_sources(suite.path)
suite.sources = sources suite.sources = sources
suite.binaries = self.read_binaries(suite, self.options.architectures) (suite.binaries, suite.provides_table) = self.read_binaries(suite, self.options.architectures)
try: try:
constraints_file = os.path.join(self.options.static_input_dir, 'constraints') constraints_file = os.path.join(self.options.static_input_dir, 'constraints')
@ -633,8 +633,8 @@ class Britney(object):
) )
src_data.binaries.append(pkg_id) src_data.binaries.append(pkg_id)
target_suite.binaries[arch][0][pkg_name] = bin_data target_suite.binaries[arch][pkg_name] = bin_data
pri_source_suite.binaries[arch][0][pkg_name] = bin_data pri_source_suite.binaries[arch][pkg_name] = bin_data
self.all_binaries[pkg_id] = bin_data self.all_binaries[pkg_id] = bin_data
def _load_constraints(self, constraints_file): def _load_constraints(self, constraints_file):
@ -727,8 +727,8 @@ class Britney(object):
pkg_id, pkg_id,
) )
src_data.binaries.append(pkg_id) src_data.binaries.append(pkg_id)
target_suite.binaries[arch][0][pkg_name] = bin_data target_suite.binaries[arch][pkg_name] = bin_data
pri_source_suite.binaries[arch][0][pkg_name] = bin_data pri_source_suite.binaries[arch][pkg_name] = bin_data
self.all_binaries[pkg_id] = bin_data self.all_binaries[pkg_id] = bin_data
return constraints return constraints
@ -921,12 +921,13 @@ class Britney(object):
The `Provides' field is used to populate the virtual packages list. The `Provides' field is used to populate the virtual packages list.
The method returns a dict mapping an architecture name to a 2-element The method returns a tuple of two dicts with architecture as key and
tuple. The first element in the tuple is a map from binary package another dict as value. The value dicts of the first dict map
names to "BinaryPackage" objects; the second element is a dictionary from binary package name to "BinaryPackage" objects; the other second
which maps virtual packages to real packages that provide them. value dicts map a package name to the packages providing them.
""" """
arch2packages = {} binaries = {}
provides_table = {}
basedir = suite.path basedir = suite.path
if self.options.components: if self.options.components:
@ -937,7 +938,8 @@ class Britney(object):
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, suite.name) arch, suite.name)
arch2packages[arch] = ({}, {}) binaries[arch] = {}
provides_table[arch] = {}
continue continue
for component in self.options.components: for component in self.options.components:
binary_dir = "binary-%s" % arch binary_dir = "binary-%s" % arch
@ -964,7 +966,8 @@ class Britney(object):
packages) packages)
# create provides # create provides
provides = create_provides_map(packages) provides = create_provides_map(packages)
arch2packages[arch] = (packages, provides) binaries[arch] = packages
provides_table[arch] = provides
else: else:
for arch in architectures: for arch in architectures:
filename = os.path.join(basedir, "Packages_%s" % arch) filename = os.path.join(basedir, "Packages_%s" % arch)
@ -972,9 +975,10 @@ class Britney(object):
arch, arch,
suite.sources) suite.sources)
provides = create_provides_map(packages) provides = create_provides_map(packages)
arch2packages[arch] = (packages, provides) binaries[arch] = packages
provides_table[arch] = provides
return arch2packages return (binaries, provides_table)
def read_hints(self, hintsdir): def read_hints(self, hintsdir):
"""Read the hint commands from the specified directory """Read the hint commands from the specified directory
@ -1051,8 +1055,10 @@ class Britney(object):
""" """
# retrieve the binary package from the specified suite and arch # retrieve the binary package from the specified suite and arch
target_suite = self.suite_info.target_suite target_suite = self.suite_info.target_suite
binaries_s_a, provides_s_a = source_suite.binaries[arch] binaries_s_a = source_suite.binaries[arch]
binaries_t_a, provides_t_a = target_suite.binaries[arch] provides_s_a = source_suite.provides_table[arch]
binaries_t_a = target_suite.binaries[arch]
provides_t_a = target_suite.provides_table[arch]
binary_u = binaries_s_a[pkg] binary_u = binaries_s_a[pkg]
# local copies for better performance # local copies for better performance
@ -1189,8 +1195,8 @@ class Britney(object):
anywrongver = False anywrongver = False
anyworthdoing = False anyworthdoing = False
packages_t_a = target_suite.binaries[arch][0] packages_t_a = target_suite.binaries[arch]
packages_s_a = source_suite.binaries[arch][0] packages_s_a = source_suite.binaries[arch]
# for every binary package produced by this source in unstable for this architecture # for every binary package produced by this source in unstable for this architecture
for pkg_id in sorted(x for x in source_u.binaries if x.architecture == arch): for pkg_id in sorted(x for x in source_u.binaries if x.architecture == arch):
@ -1545,7 +1551,7 @@ class Britney(object):
# this architecture then we assume it's ok. this allows for # this architecture then we assume it's ok. this allows for
# uploads to (t-)p-u which intentionally drop binary # uploads to (t-)p-u which intentionally drop binary
# packages # packages
if any(x for x in source_suite.binaries[arch][0].values() if any(x for x in source_suite.binaries[arch].values()
if x.source == src and x.source_version == source_u.version and if x.source == src and x.source_version == source_u.version and
x.architecture != 'all'): x.architecture != 'all'):
continue continue
@ -1849,11 +1855,11 @@ class Britney(object):
continue continue
# Work around #815995 # Work around #815995
if migration_architecture == 'source' and is_removal and binary not in binaries_t[parch][0]: if migration_architecture == 'source' and is_removal and binary not in binaries_t[parch]:
continue continue
# Do not include hijacked binaries # Do not include hijacked binaries
if binaries_t[parch][0][binary].source != source_name: if binaries_t[parch][binary].source != source_name:
continue continue
bins.append(pkg_id) bins.append(pkg_id)
@ -1876,7 +1882,7 @@ class Britney(object):
# migration so will end up missing from testing # migration so will end up missing from testing
if migration_architecture != 'source' and \ if migration_architecture != 'source' and \
source_suite.suite_class.is_additional_source and \ source_suite.suite_class.is_additional_source and \
binaries_t[parch][0][binary].architecture == 'all': binaries_t[parch][binary].architecture == 'all':
continue continue
else: else:
rms.add(pkg_id) rms.add(pkg_id)
@ -1884,8 +1890,8 @@ class Britney(object):
# single binary removal; used for clearing up after smooth # single binary removal; used for clearing up after smooth
# updates but not supported as a manual hint # updates but not supported as a manual hint
else: else:
assert source_name in binaries_t[migration_architecture][0] assert source_name in binaries_t[migration_architecture]
pkg_id = binaries_t[migration_architecture][0][source_name].pkg_id pkg_id = binaries_t[migration_architecture][source_name].pkg_id
rms.add(pkg_id) rms.add(pkg_id)
# add the new binary packages (if we are not removing) # add the new binary packages (if we are not removing)
@ -1896,7 +1902,7 @@ class Britney(object):
if migration_architecture not in ['source', parch]: if migration_architecture not in ['source', parch]:
continue continue
if binaries_s[parch][0][binary].source != source_name: if binaries_s[parch][binary].source != source_name:
# This binary package has been hijacked by some other source. # This binary package has been hijacked by some other source.
# So don't add it as part of this update. # So don't add it as part of this update.
# #
@ -1910,11 +1916,11 @@ class Britney(object):
# Don't add the binary if it is cruft; smooth updates will keep it if possible # Don't add the binary if it is cruft; smooth updates will keep it if possible
if (parch not in self.options.outofsync_arches and if (parch not in self.options.outofsync_arches and
source_data.version != binaries_s[parch][0][binary].source_version): source_data.version != binaries_s[parch][binary].source_version):
# if the package was in testing, list it as skipped, so it # if the package was in testing, list it as skipped, so it
# will come back in case of an undo # will come back in case of an undo
if (binary in binaries_t[parch][0] and if (binary in binaries_t[parch] and
binaries_t[parch][0][binary].version == ver): binaries_t[parch][binary].version == ver):
skip.add(pkg_id) skip.add(pkg_id)
continue continue
@ -1948,6 +1954,7 @@ class Britney(object):
source_suite = item.suite source_suite = item.suite
target_suite = self.suite_info.target_suite target_suite = self.suite_info.target_suite
packages_t = target_suite.binaries packages_t = target_suite.binaries
provides_t = target_suite.provides_table
inst_tester = self._inst_tester inst_tester = self._inst_tester
eqv_set = set() eqv_set = set()
@ -1992,7 +1999,8 @@ class Britney(object):
for rm_pkg_id in rms: for rm_pkg_id in rms:
binary, version, parch = rm_pkg_id binary, version, parch = rm_pkg_id
pkey = (binary, parch) pkey = (binary, parch)
binaries_t_a, provides_t_a = packages_t[parch] binaries_t_a = packages_t[parch]
provides_t_a = provides_t[parch]
pkg_data = binaries_t_a[binary] pkg_data = binaries_t_a[binary]
# save the old binary for undo # save the old binary for undo
@ -2032,7 +2040,8 @@ class Britney(object):
for updated_pkg_id in updates: for updated_pkg_id in updates:
binary, new_version, parch = updated_pkg_id binary, new_version, parch = updated_pkg_id
key = (binary, parch) key = (binary, parch)
binaries_t_a, provides_t_a = packages_t[parch] binaries_t_a = packages_t[parch]
provides_t_a = provides_t[parch]
equivalent_replacement = key in eqv_set equivalent_replacement = key in eqv_set
# obviously, added/modified packages are affected # obviously, added/modified packages are affected
@ -2068,7 +2077,7 @@ class Britney(object):
affected_direct.update(inst_tester.reverse_dependencies_of(tpkg_id)) affected_direct.update(inst_tester.reverse_dependencies_of(tpkg_id))
# add/update the binary package from the source suite # add/update the binary package from the source suite
new_pkg_data = packages_s[parch][0][binary] new_pkg_data = packages_s[parch][binary]
binaries_t_a[binary] = new_pkg_data binaries_t_a[binary] = new_pkg_data
inst_tester.add_testing_binary(updated_pkg_id) inst_tester.add_testing_binary(updated_pkg_id)
# register new provided packages # register new provided packages
@ -2501,9 +2510,9 @@ class Britney(object):
target_suite = self.suite_info.target_suite target_suite = self.suite_info.target_suite
sources_t = target_suite.sources sources_t = target_suite.sources
binaries_t = target_suite.binaries binaries_t = target_suite.binaries
used = set(binaries_t[arch][0][binary].source used = set(binaries_t[arch][binary].source
for arch in binaries_t for arch in binaries_t
for binary in binaries_t[arch][0] for binary in binaries_t[arch]
) )
removals = [MigrationItem("-%s/%s" % (source, sources_t[source].version)) removals = [MigrationItem("-%s/%s" % (source, sources_t[source].version))
for source in sources_t if source not in used for source in sources_t if source not in used
@ -2776,7 +2785,7 @@ class Britney(object):
all = defaultdict(set) all = defaultdict(set)
binaries_t = self.suite_info.target_suite.binaries binaries_t = self.suite_info.target_suite.binaries
for p in nuninst[arch]: for p in nuninst[arch]:
pkg = binaries_t[arch][0][p] pkg = binaries_t[arch][p]
all[(pkg.source, pkg.source_version)].add(p) all[(pkg.source, pkg.source_version)].add(p)
print('* %s' % arch) print('* %s' % arch)

1
britney2/__init__.py
Unescape View File

@ -35,6 +35,7 @@ class Suite(object):
self.suite_short_name = suite_short_name if suite_short_name else '' self.suite_short_name = suite_short_name if suite_short_name else ''
self.sources = {} self.sources = {}
self.binaries = {} self.binaries = {}
self.provides_table = {}
@property @property
def excuses_suffix(self): def excuses_suffix(self):

4
britney2/installability/builder.py
Unescape View File

@ -32,9 +32,9 @@ def build_installability_tester(suite_info, archs):
def _build_inst_tester_on_suite_arch(builder, suite_info, suite, arch): def _build_inst_tester_on_suite_arch(builder, suite_info, suite, arch):
packages_s_a = suite.binaries[arch][0] packages_s_a = suite.binaries[arch]
is_target = suite.suite_class.is_target is_target = suite.suite_class.is_target
bin_prov = [s.binaries[arch] for s in suite_info] bin_prov = [(s.binaries[arch], s.provides_table[arch]) for s in suite_info]
solvers = get_dependency_solvers solvers = get_dependency_solvers
for pkgdata in packages_s_a.values(): for pkgdata in packages_s_a.values():
pkg_id = pkgdata.pkg_id pkg_id = pkgdata.pkg_id

6
britney2/policies/autopkgtest.py
Unescape View File

@ -371,7 +371,7 @@ class AutopkgtestPolicy(BasePolicy):
'''Check if package is covered by autodep8 '''Check if package is covered by autodep8
srcinfo is an item from self.britney.sources srcinfo is an item from self.britney.sources
binaries is self.britney.binaries['unstable'][arch][0] binaries is self.britney.binaries['unstable'][arch]
''' '''
# autodep8? # autodep8?
for t in srcinfo.testsuite: for t in srcinfo.testsuite:
@ -393,7 +393,7 @@ class AutopkgtestPolicy(BasePolicy):
suite_info = self.suite_info suite_info = self.suite_info
sources_s = suite_info[suite].sources sources_s = suite_info[suite].sources
binaries_info = sources_s[source_name] binaries_info = sources_s[source_name]
packages_s_a = suite_info[suite].binaries[arch][0] packages_s_a = suite_info[suite].binaries[arch]
# request tests (unless they were already requested earlier or have a result) # request tests (unless they were already requested earlier or have a result)
tests = self.tests_for_source(source_name, source_version, arch) tests = self.tests_for_source(source_name, source_version, arch)
is_huge = False is_huge = False
@ -516,7 +516,7 @@ class AutopkgtestPolicy(BasePolicy):
source_suite = self.suite_info.primary_source_suite source_suite = self.suite_info.primary_source_suite
target_suite = self.suite_info.target_suite target_suite = self.suite_info.target_suite
sources_info = target_suite.sources sources_info = target_suite.sources
binaries_info = target_suite.binaries[arch][0] binaries_info = target_suite.binaries[arch]
reported_pkgs = set() reported_pkgs = set()

8
britney2/policies/policy.py
Unescape View File

@ -686,15 +686,19 @@ class BuildDependsPolicy(BasePolicy):
source_suite = self.suite_info[suite] source_suite = self.suite_info[suite]
target_suite = self.suite_info.target_suite target_suite = self.suite_info.target_suite
binaries_s = source_suite.binaries binaries_s = source_suite.binaries
provides_s = source_suite.provides_table
binaries_t = target_suite.binaries binaries_t = target_suite.binaries
provides_t = target_suite.provides_table
unsat_bd = {} unsat_bd = {}
relevant_archs = {binary.architecture for binary in source_data_srcdist.binaries relevant_archs = {binary.architecture for binary in source_data_srcdist.binaries
if britney.all_binaries[binary].architecture != 'all'} if britney.all_binaries[binary].architecture != 'all'}
for arch in (arch for arch in self.options.architectures if arch in relevant_archs): for arch in (arch for arch in self.options.architectures if arch in relevant_archs):
# retrieve the binary package from the specified suite and arch # retrieve the binary package from the specified suite and arch
binaries_s_a, provides_s_a = binaries_s[arch] binaries_s_a = binaries_s[arch]
binaries_t_a, provides_t_a = binaries_t[arch] provides_s_a = provides_s[arch]
binaries_t_a = binaries_t[arch]
provides_t_a = provides_t[arch]
# for every dependency block (formed as conjunction of disjunction) # for every dependency block (formed as conjunction of disjunction)
for block_txt in deps.split(','): for block_txt in deps.split(','):
block = parse_src_depends(block_txt, False, arch) block = parse_src_depends(block_txt, False, arch)

34
britney2/utils.py
Unescape View File

@ -115,6 +115,7 @@ def undo_changes(lundo, inst_tester, suite_info, all_binary_packages):
target_suite = suite_info.target_suite target_suite = suite_info.target_suite
sources_t = target_suite.sources sources_t = target_suite.sources
binaries_t = target_suite.binaries binaries_t = target_suite.binaries
provides_t = target_suite.provides_table
# STEP 1 # STEP 1
# undo all the changes for sources # undo all the changes for sources
@ -134,7 +135,7 @@ def undo_changes(lundo, inst_tester, suite_info, all_binary_packages):
binary, _, arch = pkg_id binary, _, arch = pkg_id
if item.architecture in ['source', arch]: if item.architecture in ['source', arch]:
try: try:
del binaries_t[arch][0][binary] del binaries_t[arch][binary]
except KeyError: except KeyError:
# If this happens, pkg_id must be a cruft item that # If this happens, pkg_id must be a cruft item that
# was *not* migrated. # was *not* migrated.
@ -147,7 +148,7 @@ def undo_changes(lundo, inst_tester, suite_info, all_binary_packages):
for (undo, item) in lundo: for (undo, item) in lundo:
for p in undo['binaries']: for p in undo['binaries']:
binary, arch = p binary, arch = p
binaries_t_a = binaries_t[arch][0] binaries_t_a = binaries_t[arch]
assert binary not in binaries_t_a assert binary not in binaries_t_a
pkgdata = all_binary_packages[undo['binaries'][p]] pkgdata = all_binary_packages[undo['binaries'][p]]
binaries_t_a[binary] = pkgdata binaries_t_a[binary] = pkgdata
@ -157,10 +158,10 @@ def undo_changes(lundo, inst_tester, suite_info, all_binary_packages):
# undo all changes to virtual packages # undo all changes to virtual packages
for (undo, item) in lundo: for (undo, item) in lundo:
for provided_pkg, arch in undo['nvirtual']: for provided_pkg, arch in undo['nvirtual']:
del binaries_t[arch][1][provided_pkg] del provides_t[arch][provided_pkg]
for p in undo['virtual']: for p in undo['virtual']:
provided_pkg, arch = p provided_pkg, arch = p
binaries_t[arch][1][provided_pkg] = undo['virtual'][p] provides_t[arch][provided_pkg] = undo['virtual'][p]
def log_and_format_old_libraries(logger, libs): def log_and_format_old_libraries(logger, libs):
@ -290,7 +291,7 @@ def write_heidi(filename, target_suite, *, outofsync_arches=frozenset(), sorted=
# write binary packages # write binary packages
for arch in sorted(packages_t): for arch in sorted(packages_t):
binaries = packages_t[arch][0] binaries = packages_t[arch]
for pkg_name in sorted(binaries): for pkg_name in sorted(binaries):
pkg = binaries[pkg_name] pkg = binaries[pkg_name]
pkgv = pkg.version pkgv = pkg.version
@ -442,7 +443,7 @@ def write_controlfiles(target_suite):
for arch in packages_s: for arch in packages_s:
filename = os.path.join(basedir, 'Packages_%s' % arch) filename = os.path.join(basedir, 'Packages_%s' % arch)
binaries = packages_s[arch][0] binaries = packages_s[arch]
with open(filename, 'w', encoding='utf-8') as f: with open(filename, 'w', encoding='utf-8') as f:
for pkg in binaries: for pkg in binaries:
output = "Package: %s\n" % pkg output = "Package: %s\n" % pkg
@ -493,10 +494,10 @@ def old_libraries(suite_info, outofsync_arches=frozenset()):
binaries_s = suite_info.primary_source_suite.binaries binaries_s = suite_info.primary_source_suite.binaries
removals = [] removals = []
for arch in binaries_t: for arch in binaries_t:
for pkg_name in binaries_t[arch][0]: for pkg_name in binaries_t[arch]:
pkg = binaries_t[arch][0][pkg_name] pkg = binaries_t[arch][pkg_name]
if sources_t[pkg.source].version != pkg.source_version and \ if sources_t[pkg.source].version != pkg.source_version and \
(arch not in outofsync_arches or pkg_name not in binaries_s[arch][0]): (arch not in outofsync_arches or pkg_name not in binaries_s[arch]):
migration = "-" + "/".join((pkg_name, arch, pkg.source_version)) migration = "-" + "/".join((pkg_name, arch, pkg.source_version))
removals.append(MigrationItem(migration)) removals.append(MigrationItem(migration))
return removals return removals
@ -546,8 +547,8 @@ def clone_nuninst(nuninst, packages_s, architectures):
""" """
clone = nuninst.copy() clone = nuninst.copy()
for arch in architectures: for arch in architectures:
clone[arch] = set(x for x in nuninst[arch] if x in packages_s[arch][0]) clone[arch] = set(x for x in nuninst[arch] if x in packages_s[arch])
clone[arch + "+all"] = set(x for x in nuninst[arch + "+all"] if x in packages_s[arch][0]) clone[arch + "+all"] = set(x for x in nuninst[arch + "+all"] if x in packages_s[arch])
return clone return clone
@ -585,7 +586,7 @@ def test_installability(inst_tester, pkg_name, pkg_id, broken, nuninst_arch):
def check_installability(inst_tester, binaries, arch, updates, affected, check_archall, nuninst): def check_installability(inst_tester, binaries, arch, updates, affected, check_archall, nuninst):
broken = nuninst[arch + "+all"] broken = nuninst[arch + "+all"]
packages_t_a = binaries[arch][0] packages_t_a = binaries[arch]
improvement = 0 improvement = 0
# broken packages (first round) # broken packages (first round)
@ -918,7 +919,7 @@ def compile_nuninst(binaries_t, inst_tester, architectures, nobreakall_arches):
# check all the packages for this architecture # check all the packages for this architecture
nuninst[arch] = set() nuninst[arch] = set()
packages_t_a = binaries_t[arch][0] packages_t_a = binaries_t[arch]
for pkg_name, pkg_data in packages_t_a.items(): for pkg_name, pkg_data in packages_t_a.items():
r = inst_tester.is_installable(pkg_data.pkg_id) r = inst_tester.is_installable(pkg_data.pkg_id)
if not r: if not r:
@ -946,14 +947,13 @@ def find_smooth_updateable_binaries(binaries_to_check, source_data,
cruft = False cruft = False
# Not a candidate for smooth up date (newer non-cruft version in unstable) # Not a candidate for smooth up date (newer non-cruft version in unstable)
if binary in binaries_s[parch][0]: if binary in binaries_s[parch]:
if binaries_s[parch][0][binary].source_version == source_data.version: if binaries_s[parch][binary].source_version == source_data.version:
continue continue
cruft = True cruft = True
# Maybe a candidate (cruft or removed binary): check if config allows us to smooth update it. # Maybe a candidate (cruft or removed binary): check if config allows us to smooth update it.
if cruft or 'ALL' in smooth_updates or binaries_t[parch][0][binary].section in smooth_updates: if cruft or 'ALL' in smooth_updates or binaries_t[parch][binary].section in smooth_updates:
# if the package has reverse-dependencies which are # if the package has reverse-dependencies which are
# built from other sources, it's a valid candidate for # built from other sources, it's a valid candidate for
# a smooth update. if not, it may still be a valid # a smooth update. if not, it may still be a valid

Write Preview
Loading…
Cancel
Save