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

Simplify undo code handling sources

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

12
britney2/migration.py
View File

@ -245,16 +245,12 @@ class MigrationManager(object):
# 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
if item.package in sources_t: undo['sources'][item.package] = sources_t.get(item.package)
source = sources_t[item.package]
undo['sources'][item.package] = source
del sources_t[item.package]
else:
# the package didn't exist, so we mark it as to-be-removed in case of undo
undo['sources']['-' + item.package] = True
# add/update the source package # add/update the source package
if not item.is_removal: if item.is_removal:
del sources_t[item.package]
else:
sources_t[item.package] = source_suite.sources[item.package] sources_t[item.package] = source_suite.sources[item.package]
eqv_set = compute_eqv_set(pkg_universe, updates, rms) eqv_set = compute_eqv_set(pkg_universe, updates, rms)

8
britney2/transaction.py
View File

@ -68,11 +68,11 @@ class MigrationTransactionState(object):
# STEP 1 # STEP 1
# undo all the changes for sources # undo all the changes for sources
for (undo, updated_binaries) in lundo: for (undo, updated_binaries) in lundo:
for k in undo['sources']: for (k, v) in undo['sources'].items():
if k[0] == '-': if v is None:
del sources_t[k[1:]] del sources_t[k]
else: else:
sources_t[k] = undo['sources'][k] sources_t[k] = v
# STEP 2 # STEP 2
# undo all new/updated binaries # undo all new/updated binaries