Lubuntu/britney2-ubuntu
8
0
Fork 0
mirror of https://git.launchpad.net/~ubuntu-release/britney/+git/britney2-ubuntu synced 2025-04-17 06:01:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

do_all: Prune cruft after non-recursive hints (e.g. "easy")

Browse Source 
Signed-off-by: Niels Thykier <niels@thykier.net>
This commit is contained in:
Niels Thykier 2019-01-21 20:12:46 +00:00
parent c30ecbb7e8
commit 2c9e0b9b97
No known key found for this signature in database
GPG Key ID: A65B78DBE67C7AAC
2 changed files with 13 additions and 1 deletions

12
britney.py

@ -1615,6 +1615,18 @@ class Britney(object):
# Ensure upgrade_me and selected do not overlap, if we
# follow-up with a recurse ("hint"-hint).
upgrade_me = [x for x in upgrade_me if x not in set(selected)]
else:
# On non-recursive hints check for cruft and purge it proactively in case it "fixes" the hint.
cruft = [x for x in upgrade_me if x.is_cruft_removal]
cruft.extend(new_cruft)
if cruft:
output_logger.info("Checking if changes enables cruft removal")
(nuninst_end, remaining_cruft) = self.iter_packages(cruft,
selected,
nuninst=nuninst_end)
output_logger.info("Removed %d of %d cruft item(s) after the changes",
len(cruft) - len(remaining_cruft), len(cruft))
new_cruft.difference_update(remaining_cruft)
# Add new cruft items regardless of whether we recurse. A future run might clean
# them for us.

2
britney2/migration.py

@ -451,7 +451,7 @@ class MigrationManager(object):
is_accepted = False
break
new_cruft = [self._migration_item_factory.generate_removal_for_cruft_item(x) for x in smooth_updates]
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)