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

Don't add smooth-updatable cruft to migration items

Browse Source 
Based on patch by Niels Thykier.

Signed-off-by: Ivo De Decker <ivodd@debian.org>
This commit is contained in:
Ivo De Decker 2018-10-24 22:15:27 +00:00
parent b752bdea07
commit 9c606ef533
2 changed files with 38 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
britney.py
View File

@ -1267,7 +1267,7 @@ class Britney(object):
primary_source_suite = self.suite_info.primary_source_suite primary_source_suite = self.suite_info.primary_source_suite
if not (ssrc and source_suite is not primary_source_suite): if not (ssrc and source_suite is not primary_source_suite):
# for every binary package produced by this source in testing for this architecture # for every binary package produced by this source in testing for this architecture
_, _, smoothbins = self._compute_groups(src, _, _, smoothbins, _ = self._compute_groups(src,
primary_source_suite, primary_source_suite,
arch, arch,
False) False)
@ -1831,6 +1831,7 @@ class Britney(object):
adds = set() adds = set()
rms = set() rms = set()
smoothbins = set() smoothbins = set()
skip = set()
# remove all binary packages (if the source already exists) # remove all binary packages (if the source already exists)
if migration_architecture == 'source' or not is_removal: if migration_architecture == 'source' or not is_removal:
@ -1858,6 +1859,7 @@ class Britney(object):
if allow_smooth_updates and source_suite.suite_class.is_primary_source: if allow_smooth_updates and source_suite.suite_class.is_primary_source:
smoothbins = find_smooth_updateable_binaries(bins, smoothbins = find_smooth_updateable_binaries(bins,
source_suite.sources[source_name],
inst_tester, inst_tester,
binaries_t, binaries_t,
binaries_s, binaries_s,
@ -1890,7 +1892,7 @@ class Britney(object):
if not is_removal: if not is_removal:
source_data = source_suite.sources[source_name] source_data = source_suite.sources[source_name]
for pkg_id in source_data.binaries: for pkg_id in source_data.binaries:
binary, _, parch = pkg_id binary, ver, parch = pkg_id
if migration_architecture not in ['source', parch]: if migration_architecture not in ['source', parch]:
continue continue
@ -1906,15 +1908,19 @@ class Britney(object):
rms.remove((rm_b, rm_v, rm_p)) rms.remove((rm_b, rm_v, rm_p))
continue continue
# Don't add the binary if it is old cruft that is no longer in testing # 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 and source_data.version != binaries_s[parch][0][binary].source_version):
binary not in binaries_t[parch][0]): # if the package was in testing, list it as skipped, so it
# will come back in case of an undo
if (binary in binaries_t[parch][0] and
binaries_t[parch][0][binary].version == ver):
skip.add(pkg_id)
continue continue
adds.add(pkg_id) adds.add(pkg_id)
return (adds, rms, smoothbins) return (adds, rms, smoothbins, skip)
def doop_source(self, item, hint_undo=None, removals=frozenset()): def doop_source(self, item, hint_undo=None, removals=frozenset()):
"""Apply a change to the target suite as requested by `item` """Apply a change to the target suite as requested by `item`
@ -1945,7 +1951,7 @@ class Britney(object):
inst_tester = self._inst_tester inst_tester = self._inst_tester
eqv_set = set() eqv_set = set()
updates, rms, _ = self._compute_groups(item.package, updates, rms, _, skip = self._compute_groups(item.package,
source_suite, source_suite,
item.architecture, item.architecture,
item.is_removal, item.is_removal,
@ -2009,6 +2015,16 @@ class Britney(object):
del binaries_t_a[binary] del binaries_t_a[binary]
inst_tester.remove_testing_binary(rm_pkg_id) inst_tester.remove_testing_binary(rm_pkg_id)
# skipped binaries are binaries in testing, that are also in unstable
# (as cruft), but are skipped there. in case of undo, they will be
# removed with (newer) the source package, so they need to be put back
for skip_pkg_id in skip:
binary, version, parch = skip_pkg_id
pkey = (binary, parch)
if pkey in undo['binaries']:
assert(undo['binaries'][pkey] == skip_pkg_id)
undo['binaries'][pkey] = skip_pkg_id
# Add/Update binary packages in testing # Add/Update binary packages in testing
if updates: if updates:
packages_s = source_suite.binaries packages_s = source_suite.binaries
@ -2102,7 +2118,7 @@ class Britney(object):
affected_direct = set() affected_direct = set()
affected_all = set() affected_all = set()
for item in actions: for item in actions:
_, rms, _ = self._compute_groups(item.package, item.suite, _, rms, _, _ = self._compute_groups(item.package, item.suite,
item.architecture, item.architecture,
item.is_removal, item.is_removal,
allow_smooth_updates=False) allow_smooth_updates=False)
@ -2182,7 +2198,7 @@ class Britney(object):
output_logger = self.output_logger output_logger = self.output_logger
for y in sorted((y for y in packages), key=attrgetter('uvname')): for y in sorted((y for y in packages), key=attrgetter('uvname')):
updates, rms, _ = self._compute_groups(y.package, y.suite, y.architecture, y.is_removal) updates, rms, _, _ = self._compute_groups(y.package, y.suite, y.architecture, y.is_removal)
result = (y, frozenset(updates), frozenset(rms)) result = (y, frozenset(updates), frozenset(rms))
group_info[y] = result group_info[y] = result

17
britney2/utils.py
View File

@ -935,15 +935,24 @@ def compile_nuninst(binaries_t, inst_tester, architectures, nobreakall_arches):
return nuninst return nuninst
def find_smooth_updateable_binaries(binaries_to_check, inst_tester, binaries_t, binaries_s, removals, smooth_updates): def find_smooth_updateable_binaries(binaries_to_check, source_data,
inst_tester, binaries_t, binaries_s, removals, smooth_updates):
check = set() check = set()
smoothbins = set() smoothbins = set()
for pkg_id in binaries_to_check: for pkg_id in binaries_to_check:
binary, _, parch = pkg_id binary, _, parch = pkg_id
# if a smooth update is possible for the package, skip it
if binary not in binaries_s[parch][0] and \ cruft = False
('ALL' in smooth_updates or binaries_t[parch][0][binary].section in smooth_updates):
# Not a candidate for smooth up date (newer non-cruft version in unstable)
if binary in binaries_s[parch][0]:
if binaries_s[parch][0][binary].source_version == source_data.version:
continue
cruft = True
# 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 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