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

Remove new cruft items in iter_packages

Browse Source 
Signed-off-by: Niels Thykier <niels@thykier.net>
This commit is contained in:
Niels Thykier 2019-01-06 11:40:05 +00:00
parent 32ebe9d4e0
commit 5d408fa800
No known key found for this signature in database
GPG Key ID: A65B78DBE67C7AAC
2 changed files with 31 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
britney.py
View File

@ -330,7 +330,7 @@ class Britney(object):
self._migration_item_factory = MigrationItemFactory(self.suite_info) self._migration_item_factory = MigrationItemFactory(self.suite_info)
self._hint_parser = HintParser(self._migration_item_factory) self._hint_parser = HintParser(self._migration_item_factory)
self._migration_manager = MigrationManager(self.options, self.suite_info, self.all_binaries, self.pkg_universe, self._migration_manager = MigrationManager(self.options, self.suite_info, self.all_binaries, self.pkg_universe,
self.constraints) self.constraints, self._migration_item_factory)
if not self.options.nuninst_cache: if not self.options.nuninst_cache:
self.logger.info("Building the list of non-installable packages for the full archive") self.logger.info("Building the list of non-installable packages for the full archive")
@ -1473,8 +1473,10 @@ class Britney(object):
with mm.start_transaction() as transaction: with mm.start_transaction() as transaction:
accepted = False accepted = False
try: try:
accepted, nuninst_after, failed_arch = mm.migrate_item_to_target_suite(comp, accepted, nuninst_after, failed_arch, new_cruft = mm.migrate_item_to_target_suite(
nuninst_last_accepted) comp,
nuninst_last_accepted
)
if accepted: if accepted:
selected.extend(comp) selected.extend(comp)
transaction.commit() transaction.commit()
@ -1491,6 +1493,11 @@ class Britney(object):
if self.options.check_consistency_level >= 3: if self.options.check_consistency_level >= 3:
target_suite.check_suite_source_pkg_consistency('iter_packages after commit') target_suite.check_suite_source_pkg_consistency('iter_packages after commit')
nuninst_last_accepted = nuninst_after nuninst_last_accepted = nuninst_after
for cruft_item in new_cruft:
_, updates, rms, _ = mm.compute_groups(cruft_item)
result = (cruft_item, frozenset(updates), frozenset(rms))
group_info[cruft_item] = result
worklist.extend([x] for x in new_cruft)
rescheduled_packages.extend(maybe_rescheduled_packages) rescheduled_packages.extend(maybe_rescheduled_packages)
maybe_rescheduled_packages.clear() maybe_rescheduled_packages.clear()
else: else:
@ -1609,15 +1616,19 @@ class Britney(object):
if init: if init:
# init => a hint (e.g. "easy") - so do the hint run # init => a hint (e.g. "easy") - so do the hint run
(_, nuninst_end, _) = mm.migrate_item_to_target_suite(selected, (_, nuninst_end, _, new_cruft) = mm.migrate_item_to_target_suite(selected,
self.nuninst_orig, self.nuninst_orig,
stop_on_first_regression=False) stop_on_first_regression=False)
if recurse: if recurse:
# Ensure upgrade_me and selected do not overlap, if we # Ensure upgrade_me and selected do not overlap, if we
# follow-up with a recurse ("hint"-hint). # follow-up with a recurse ("hint"-hint).
upgrade_me = [x for x in upgrade_me if x not in set(selected)] upgrade_me = [x for x in upgrade_me if x not in set(selected)]
# Add new cruft items regardless of whether we recurse. A future run might clean
# them for us.
upgrade_me.extend(new_cruft)
if recurse: if recurse:
# Either the main run or the recursive run of a "hint"-hint. # Either the main run or the recursive run of a "hint"-hint.
(nuninst_end, extra) = self.iter_packages(upgrade_me, (nuninst_end, extra) = self.iter_packages(upgrade_me,

24
britney2/migration.py
View File

@ -37,7 +37,7 @@ def is_nuninst_worse(must_be_installable, nuninst_now_arch, nuninst_after_arch):
class MigrationManager(object): class MigrationManager(object):
def __init__(self, options, suite_info, all_binaries, pkg_universe, constraints): def __init__(self, options, suite_info, all_binaries, pkg_universe, constraints, migration_item_factory):
self.options = options self.options = options
self.suite_info = suite_info self.suite_info = suite_info
self.all_binaries = all_binaries self.all_binaries = all_binaries
@ -45,6 +45,7 @@ class MigrationManager(object):
self.constraints = constraints self.constraints = constraints
self._transactions = [] self._transactions = []
self._all_architectures = frozenset(self.options.architectures) self._all_architectures = frozenset(self.options.architectures)
self._migration_item_factory = migration_item_factory
@property @property
def current_transaction(self): def current_transaction(self):
@ -243,8 +244,7 @@ class MigrationManager(object):
pkg_universe = self.pkg_universe pkg_universe = self.pkg_universe
transaction = self.current_transaction transaction = self.current_transaction
source_name, updates, rms, _ = self.compute_groups(item, removals=removals) source_name, updates, rms, smooth_updates = self.compute_groups(item, removals=removals)
sources_t = target_suite.sources sources_t = target_suite.sources
# Handle the source package # Handle the source package
old_source = sources_t.get(source_name) old_source = sources_t.get(source_name)
@ -364,14 +364,14 @@ class MigrationManager(object):
if transaction: if transaction:
transaction.add_undo_item(undo, updated_binaries) transaction.add_undo_item(undo, updated_binaries)
# return the affected packages (direct and than all) # return the affected packages (direct and than all)
return (affected_direct, affected_all) return (affected_direct, affected_all, smooth_updates)
def _apply_multiple_items_to_target_suite(self, items): def _apply_multiple_items_to_target_suite(self, items):
is_source_migration = False is_source_migration = False
if len(items) == 1: if len(items) == 1:
item = items[0] item = items[0]
# apply the changes # apply the changes
affected_direct, affected_all = self._apply_item_to_target_suite(item) affected_direct, affected_all, smooth_updates = self._apply_item_to_target_suite(item)
if item.architecture == 'source': if item.architecture == 'source':
affected_architectures = self._all_architectures affected_architectures = self._all_architectures
is_source_migration = True is_source_migration = True
@ -382,6 +382,7 @@ class MigrationManager(object):
removals = set() removals = set()
affected_direct = set() affected_direct = set()
affected_all = set() affected_all = set()
smooth_updates = set()
for item in items: for item in items:
_, _, rms, _ = self.compute_groups(item, allow_smooth_updates=False) _, _, rms, _ = self.compute_groups(item, allow_smooth_updates=False)
removals.update(rms) removals.update(rms)
@ -392,12 +393,13 @@ class MigrationManager(object):
is_source_migration = True is_source_migration = True
for item in items: for item in items:
item_affected_direct, item_affected_all = self._apply_item_to_target_suite(item, item_affected_direct, item_affected_all, item_smooth = self._apply_item_to_target_suite(item,
removals=removals) removals=removals)
affected_direct.update(item_affected_direct) affected_direct.update(item_affected_direct)
affected_all.update(item_affected_all) affected_all.update(item_affected_all)
smooth_updates.update(item_smooth)
return is_source_migration, affected_architectures, affected_direct, affected_all return is_source_migration, affected_architectures, affected_direct, affected_all, smooth_updates
def migrate_item_to_target_suite(self, items, nuninst_now, stop_on_first_regression=True): def migrate_item_to_target_suite(self, items, nuninst_now, stop_on_first_regression=True):
is_accepted = True is_accepted = True
@ -409,7 +411,7 @@ class MigrationManager(object):
break_arches = self.options.break_arches break_arches = self.options.break_arches
arch = None arch = None
is_source_migration, affected_architectures, affected_direct, affected_all = \ is_source_migration, affected_architectures, affected_direct, affected_all, smooth_updates = \
self._apply_multiple_items_to_target_suite(items) self._apply_multiple_items_to_target_suite(items)
# Optimise the test if we may revert directly. # Optimise the test if we may revert directly.
@ -448,7 +450,9 @@ class MigrationManager(object):
is_accepted = False is_accepted = False
break break
return (is_accepted, nuninst_after, arch) new_cruft = [self._migration_item_factory.generate_removal_for_cruft_item(x) for x in smooth_updates]
return (is_accepted, nuninst_after, arch, new_cruft)
@contextlib.contextmanager @contextlib.contextmanager
def start_transaction(self): def start_transaction(self):