solver: Reduce two small loops into a comprehension

Signed-off-by: Niels Thykier <niels@thykier.net>
ubuntu/rebased
Niels Thykier 6 years ago
parent d3e06fc45f
commit 16dc303190
No known key found for this signature in database
GPG Key ID: A65B78DBE67C7AAC

@ -16,6 +16,7 @@
import logging import logging
from collections import deque from collections import deque
from itertools import chain
from britney2.utils import (ifilter_only, iter_except) from britney2.utils import (ifilter_only, iter_except)
@ -237,15 +238,9 @@ class InstallabilitySolver(object):
# that migrates based on various rules. # that migrates based on various rules.
for (item, adds, rms) in groups: for (item, adds, rms) in groups:
key = str(item) key = str(item)
oldcons = set() oldcons = set(chain.from_iterable(universe.negative_dependencies_of(r) for r in rms))
newcons = set() newcons = set(chain.from_iterable(universe.negative_dependencies_of(a) for a in adds))
for r in rms: oldcons -= newcons
oldcons.update(universe.negative_dependencies_of(r))
for a in adds:
newcons.update(universe.negative_dependencies_of(a))
current = newcons & oldcons
oldcons -= current
newcons -= current
if oldcons: if oldcons:
# Some of the old binaries have "conflicts" that will # Some of the old binaries have "conflicts" that will
# be removed. # be removed.

Loading…
Cancel
Save