Optimize out "nvirtual" member of undo items

Signed-off-by: Niels Thykier <niels@thykier.net>

britney2/migration.py

@@ -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:
+                    if key not in undo['virtual']:
-                        undo['nvirtual'].append(key)
+                        restore_as = provides_t_a[provided_pkg].copy() if provided_pkg in provides_t_a else None
-                        provides_t_a[provided_pkg] = set()
+                        undo['virtual'][key] = restore_as
-                    elif key not in undo['virtual']:
-                        undo['virtual'][key] = provides_t_a[provided_pkg].copy()
                     provides_t_a[provided_pkg].add((binary, prov_version))
                 if not equivalent_replacement:
                     # all the reverse dependencies are affected by the change

britney2/transaction.py

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