solver: Rename a variable to avoid confusion

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

@ -337,11 +337,11 @@ class InstallabilitySolver(object):
# Now that we got the SSCs (in comps), we select on item from # Now that we got the SSCs (in comps), we select on item from
# each SSC to represent the group and become an ID for that # each SSC to represent the group and become an ID for that
# SSC. # SSC.
# * scc_items[ssc_id] => All the items in that SSC # * scc_keys[ssc_id] => All the item-keys in that SSC
# #
# We also "repair" the ordering, so we know in which order the # We also "repair" the ordering, so we know in which order the
# hints should be emitted. # hints should be emitted.
scc_items = self._merge_items_into_components(comps, order) scc_keys = self._merge_items_into_components(comps, order)
if debug_solver: # pragma: no cover if debug_solver: # pragma: no cover
self.logger.debug("-- PARTIAL ORDER --") self.logger.debug("-- PARTIAL ORDER --")
@ -368,9 +368,9 @@ class InstallabilitySolver(object):
if order[cur].after <= emitted and cur not in emitted: if order[cur].after <= emitted and cur not in emitted:
# This item is ready to be emitted right now # This item is ready to be emitted right now
if debug_solver: # pragma: no cover if debug_solver: # pragma: no cover
self.logger.debug("%s -- %s", cur, sorted(scc_items[cur])) self.logger.debug("%s -- %s", cur, sorted(scc_keys[cur]))
emitted.add(cur) emitted.add(cur)
result.append([key2item[x] for x in scc_items[cur]]) result.append([key2item[x] for x in scc_keys[cur]])
if order[cur].before: if order[cur].before:
# There are components that come after this one. # There are components that come after this one.
# Add it to queue: # Add it to queue:

Loading…
Cancel
Save