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

Optimize out "nvirtual" member of undo items

Browse Source 
Signed-off-by: Niels Thykier <niels@thykier.net>
This commit is contained in:
Niels Thykier 2018-12-19 21:37:42 +00:00
parent 5642a90449
commit 59ae7e3d68
No known key found for this signature in database
GPG Key ID: A65B78DBE67C7AAC
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
britney2/migration.py
View File

@ -227,7 +227,7 @@ class MigrationManager(object):
affected by the change (as (name, arch)-tuples) and the
dictionary undo which can be used to rollback the changes.
"""
undo = {'binaries': {}, 'sources': {}, 'virtual': {}, 'nvirtual': []}
undo = {'binaries': {}, 'sources': {}, 'virtual': {}}
affected_direct = set()
updated_binaries = set()
@ -338,11 +338,9 @@ class MigrationManager(object):
# register new provided packages
for provided_pkg, prov_version, _ in new_pkg_data.provides:
key = (provided_pkg, parch)
if provided_pkg not in provides_t_a:
undo['nvirtual'].append(key)
provides_t_a[provided_pkg] = set()
elif key not in undo['virtual']:
undo['virtual'][key] = provides_t_a[provided_pkg].copy()
if key not in undo['virtual']:
restore_as = provides_t_a[provided_pkg].copy() if provided_pkg in provides_t_a else None
undo['virtual'][key] = restore_as
provides_t_a[provided_pkg].add((binary, prov_version))
if not equivalent_replacement:
# all the reverse dependencies are affected by the change

11
britney2/transaction.py
View File

@ -100,12 +100,13 @@ class MigrationTransactionState(object):
# STEP 4
# undo all changes to virtual packages
for (undo, updated_binaries) in lundo:
for provided_pkg, arch in undo['nvirtual']:
del provides_t[arch][provided_pkg]
for p in undo['virtual']:
for (undo, _) in lundo:
for p, value in undo['virtual'].items():
provided_pkg, arch = p
provides_t[arch][provided_pkg] = undo['virtual'][p]
if value is None:
del provides_t[arch][provided_pkg]
else:
provides_t[arch][provided_pkg] = undo['virtual'][p]
@property
def is_rolled_back(self):