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

Rename a variable for clarity reasons

Browse Source 
Signed-off-by: Niels Thykier <niels@thykier.net>
This commit is contained in:
Niels Thykier 2016-11-13 22:39:57 +00:00
parent a768432eb2
commit 9ca30aac81
2 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
britney.py
View File

@ -2209,13 +2209,13 @@ class Britney(object):
affected_remain.update(inst_tester.negative_dependencies_of(rm_pkg_id)) affected_remain.update(inst_tester.negative_dependencies_of(rm_pkg_id))
# remove the provided virtual packages # remove the provided virtual packages
for j, prov_version, _ in pkg_data.provides: for provided_pkg, prov_version, _ in pkg_data.provides:
key = (j, parch) key = (provided_pkg, parch)
if key not in undo['virtual']: if key not in undo['virtual']:
undo['virtual'][key] = provides_t_a[j].copy() undo['virtual'][key] = provides_t_a[provided_pkg].copy()
provides_t_a[j].remove((binary, prov_version)) provides_t_a[provided_pkg].remove((binary, prov_version))
if not provides_t_a[j]: if not provides_t_a[provided_pkg]:
del provides_t_a[j] del provides_t_a[provided_pkg]
# finally, remove the binary package # finally, remove the binary package
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)
@ -2285,14 +2285,14 @@ class Britney(object):
binaries_t_a[binary] = new_pkg_data binaries_t_a[binary] = new_pkg_data
inst_tester.add_testing_binary(updated_pkg_id) inst_tester.add_testing_binary(updated_pkg_id)
# register new provided packages # register new provided packages
for j, prov_version, _ in new_pkg_data.provides: for provided_pkg, prov_version, _ in new_pkg_data.provides:
key = (j, parch) key = (provided_pkg, parch)
if j not in provides_t_a: if provided_pkg not in provides_t_a:
undo['nvirtual'].append(key) undo['nvirtual'].append(key)
provides_t_a[j] = set() provides_t_a[provided_pkg] = set()
elif key not in undo['virtual']: elif key not in undo['virtual']:
undo['virtual'][key] = provides_t_a[j].copy() undo['virtual'][key] = provides_t_a[provided_pkg].copy()
provides_t_a[j].add((binary, prov_version)) provides_t_a[provided_pkg].add((binary, prov_version))
if not equivalent_replacement: if not equivalent_replacement:
# all the reverse dependencies are affected by the change # all the reverse dependencies are affected by the change
affected_pos.add(updated_pkg_id) affected_pos.add(updated_pkg_id)

9
britney2/utils.py
View File

@ -153,12 +153,11 @@ def undo_changes(lundo, inst_tester, sources, binaries, all_binary_packages):
# STEP 4 # STEP 4
# undo all changes to virtual packages # undo all changes to virtual packages
for (undo, item) in lundo: for (undo, item) in lundo:
for p in undo['nvirtual']: for provided_pkg, arch in undo['nvirtual']:
j, arch = p del binaries['testing'][arch][1][provided_pkg]
del binaries['testing'][arch][1][j]
for p in undo['virtual']: for p in undo['virtual']:
j, arch = p provided_pkg, arch = p
binaries['testing'][arch][1][j] = undo['virtual'][p] binaries['testing'][arch][1][provided_pkg] = undo['virtual'][p]
def old_libraries_format(libs): def old_libraries_format(libs):