summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2010-09-26 06:43:17 -0700
committerZac Medico <zmedico@gentoo.org>2010-09-26 06:43:17 -0700
commitb8c77a67e0cf6348201dbdca8c58372ebb75b6f0 (patch)
treec5e84a84cfe46a4a44ad45916f41decbb725ba36
parenta0c2fa6dd742a273d328238604594a78107581db (diff)
downloadportage-b8c77a67e0cf6348201dbdca8c58372ebb75b6f0.tar.gz
portage-b8c77a67e0cf6348201dbdca8c58372ebb75b6f0.tar.bz2
portage-b8c77a67e0cf6348201dbdca8c58372ebb75b6f0.zip
Fix confusing messages shown by
depgraph._show_missed_update_slot_conflicts() since the fix from bug #337178. When depgraph._add_pkg() was fixed to mask the higher version in 4bc78ab0b563697b98527eebcdfe474863383cf0, we didn't adjust the parent_atoms variable so that it would contain parent atoms from the versions being masked. This resulted in confusing messages from depgraph._show_missed_update_slot_conflicts().
-rw-r--r--pym/_emerge/depgraph.py12
1 files changed, 6 insertions, 6 deletions
diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py
index 3670899de..6c38806fa 100644
--- a/pym/_emerge/depgraph.py
+++ b/pym/_emerge/depgraph.py
@@ -892,18 +892,18 @@ class depgraph(object):
self._add_parent_atom(pkg, parent_atom)
self._process_slot_conflicts()
+ if pkg > existing_node:
+ to_be_masked = pkg
+ else:
+ to_be_masked = existing_node
+
parent_atoms = \
- self._dynamic_config._parent_atoms.get(pkg, set())
+ self._dynamic_config._parent_atoms.get(to_be_masked, set())
if parent_atoms:
conflict_atoms = self._dynamic_config._slot_conflict_parent_atoms.intersection(parent_atoms)
if conflict_atoms:
parent_atoms = conflict_atoms
- if pkg > existing_node:
- to_be_masked = pkg
- else:
- to_be_masked = existing_node
-
if pkg.cpv == existing_node.cpv:
# We only care about the parent atoms
# when they trigger a downgrade.