Lubuntu/britney2-ubuntu
8
0
Fork 0
mirror of https://git.launchpad.net/~ubuntu-release/britney/+git/britney2-ubuntu synced 2025-05-25 09:21:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add source_name return value to compute_groups

Browse Source 
When the item is a single binary cruft removal, the source name is different
from the package. compute_groups has this info anyway, so just pass it on as a
returm value.

Signed-off-by: Ivo De Decker <ivodd@debian.org>
This commit is contained in:
Ivo De Decker 2019-01-09 00:49:52 +00:00
parent 046bdc60c6
commit 69c94caa01
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
britney.py
View File

@ -1441,7 +1441,7 @@ class Britney(object):
for y in sorted((y for y in packages), key=attrgetter('uvname')): for y in sorted((y for y in packages), key=attrgetter('uvname')):
try: try:
updates, rms, _ = mm.compute_groups(y) _, updates, rms, _ = mm.compute_groups(y)
result = (y, frozenset(updates), frozenset(rms)) result = (y, frozenset(updates), frozenset(rms))
group_info[y] = result group_info[y] = result
except MigrationConstraintException as e: except MigrationConstraintException as e:

13
britney2/migration.py
View File

@ -109,6 +109,7 @@ class MigrationManager(object):
else: else:
assert source_name in binaries_t[item.architecture] assert source_name in binaries_t[item.architecture]
pkg_id = binaries_t[item.architecture][source_name].pkg_id pkg_id = binaries_t[item.architecture][source_name].pkg_id
source_name = binaries_t[item.architecture][source_name].source
rms = {pkg_id} rms = {pkg_id}
smoothbins = set() smoothbins = set()
@ -156,7 +157,7 @@ class MigrationManager(object):
adds.add(pkg_id) adds.add(pkg_id)
return (adds, rms, smoothbins) return (source_name, adds, rms, smoothbins)
def _compute_removals(self, item, allow_smooth_updates, removals): def _compute_removals(self, item, allow_smooth_updates, removals):
pkg_universe = self.pkg_universe pkg_universe = self.pkg_universe
@ -241,18 +242,18 @@ class MigrationManager(object):
pkg_universe = self.pkg_universe pkg_universe = self.pkg_universe
transaction = self.current_transaction transaction = self.current_transaction
updates, rms, _ = self.compute_groups(item, removals=removals) source_name, updates, rms, _ = self.compute_groups(item, removals=removals)
# Handle the source package # Handle the source package
if item.architecture == 'source': if item.architecture == 'source':
sources_t = target_suite.sources sources_t = target_suite.sources
undo['sources'][item.package] = sources_t.get(item.package) undo['sources'][source_name] = sources_t.get(source_name)
# add/update the source package # add/update the source package
if item.is_removal: if item.is_removal:
del sources_t[item.package] del sources_t[source_name]
else: else:
sources_t[item.package] = source_suite.sources[item.package] sources_t[source_name] = source_suite.sources[source_name]
eqv_set = compute_eqv_set(pkg_universe, updates, rms) eqv_set = compute_eqv_set(pkg_universe, updates, rms)
@ -369,7 +370,7 @@ class MigrationManager(object):
affected_direct = set() affected_direct = set()
affected_all = set() affected_all = 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)
affected_architectures.add(item.architecture) affected_architectures.add(item.architecture)