Lubuntu/britney2-ubuntu
8
0
Fork 0
mirror of https://git.launchpad.net/~ubuntu-release/britney/+git/britney2-ubuntu synced 2025-04-14 12:41:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

suiteloader: Handle arch-all packages properly when merging binaries

Browse Source 
In 'partial source' mode, which we use in Ubuntu, we merge the target
(release pocket) with the source (proposed), so that proposed-migration
has a view of the complete state of the archive when it is migrating.

This merging must not be done when a package has been built in the
source suite. If it is done incorrectly, proposed-migration will see the
previous binary packages as existing when they should not.

We have code to handle this already, but it's wrong in the case of
arch:all binaries. This comes up in two ways

  - If a source package builds *only* arch:all binaries, it is not
    expected that builds will be created on arches other than the one
    which builds arch:all packages (amd64 currently). If that is built
    then the package is complete, we shouldn't merge any old binaries
    such as dropped arch:all ones from the target.
  - Relatedly, if other non-arch-all packages exist, an arch:all package
    isn't an indication that a build has taken place on other arches
    than the all buildd arch.

Fixing both of these stops old binaries being merged into a new source
when it's been built and arch:all packages are involved.
This commit is contained in:
Iain Lane 2021-02-23 11:53:50 +00:00 committed by Iain Lane
parent 53bab416d2
commit 3ddac110c6
1 changed files with 22 additions and 1 deletions

23
britney2/inputs/suiteloader.py

@ -244,6 +244,10 @@ class DebMirrorLikeSuiteContentLoader(SuiteContentLoader):
source_binaries = source.binaries
source_provides = source.provides_table
oodsrcs = defaultdict(set)
try:
all_buildarch = self._base_config.all_buildarch
except AttributeError:
all_buildarch = None
def _merge_binaries_arch(arch):
for pkg, value in target_binaries[arch].items():
@ -260,13 +264,30 @@ class DebMirrorLikeSuiteContentLoader(SuiteContentLoader):
self.logger.info("merge_binaries: pkg %s has no source, NBS?" % pkg)
continue
if target_version != source_version:
arches_built = set([source_binaries[b.architecture][b.package_name].architecture
for b in source_sources[value.source].binaries
if b.architecture in (arch, all_buildarch)])
only_builds_arch_all = arches_built == set(['all'])
# If we only build arch:all packages in the source suite,
# it will look like the package is unbuilt on the arches
# other than the all buildarch. But we don't expect a build
# there, so don't merge binaries from the target. If we
# were to, it would look like any dropped non-arch-all
# binaries had gone missing.
if only_builds_arch_all and arch != all_buildarch:
continue
current_arch = value.architecture
built = False
for b in source_sources[value.source].binaries:
if b.architecture == arch:
source_value = source_binaries[arch][b.package_name]
# arch:all packages show up in all Packages
# files, but they are only indicative of a
# build on the all_buildarch.
if current_arch in (
source_value.architecture, 'all'):
source_value.architecture, 'all') or \
(source_value.architecture == 'all' and arch == all_buildarch):
built = True
break
if built: