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

Remove an unnecessary if-statement

Browse Source 
Signed-off-by: Niels Thykier <niels@thykier.net>
This commit is contained in:
Niels Thykier 2019-01-19 18:04:54 +00:00
parent 9971714e27
commit 68407c53c0
No known key found for this signature in database
GPG Key ID: A65B78DBE67C7AAC
1 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
britney2/installability/solver.py
View File

@ -239,21 +239,20 @@ class InstallabilitySolver(object):
oldcons = set(chain.from_iterable(universe.negative_dependencies_of(r) for r in rms)) oldcons = set(chain.from_iterable(universe.negative_dependencies_of(r) for r in rms))
newcons = set(chain.from_iterable(universe.negative_dependencies_of(a) for a in adds)) newcons = set(chain.from_iterable(universe.negative_dependencies_of(a) for a in adds))
oldcons -= newcons oldcons -= newcons
if oldcons: # Some of the old binaries have "conflicts" that will
# Some of the old binaries have "conflicts" that will # be removed.
# be removed. for o in ifilter_only(ptable, oldcons):
for o in ifilter_only(ptable, oldcons): # "key" removes a conflict with one of
# "key" removes a conflict with one of # "other"'s binaries, so it is probably a good
# "other"'s binaries, so it is probably a good # idea to migrate "key" before "other"
# idea to migrate "key" before "other" other = ptable[o]
other = ptable[o] if other == key:
if other == key: # "Self-conflicts" => ignore
# "Self-conflicts" => ignore continue
continue if debug_solver and other not in order[key]['before']: # pragma: no cover
if debug_solver and other not in order[key]['before']: # pragma: no cover self.logger.debug("Conflict induced order: %s before %s", key, other)
self.logger.debug("Conflict induced order: %s before %s", key, other) order[key]['before'].add(other)
order[key]['before'].add(other) order[other]['after'].add(key)
order[other]['after'].add(key)
self._compute_group_order_rms(rms, order, key, ptable, going_out) self._compute_group_order_rms(rms, order, key, ptable, going_out)
self._compute_group_order_adds(adds, order, key, ptable, going_out, going_in) self._compute_group_order_adds(adds, order, key, ptable, going_out, going_in)