diff options
| -rw-r--r-- | pym/_emerge/__init__.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py index de5c903ef..1b9e18589 100644 --- a/pym/_emerge/__init__.py +++ b/pym/_emerge/__init__.py @@ -4314,7 +4314,7 @@ class depgraph(object): self._show_merge_list() msg = [] - msg.append("\n!!! Multiple versions within a single " + \ + msg.append("\n!!! Multiple package instances within a single " + \ "package slot have been pulled\n") msg.append("!!! into the dependency graph, resulting" + \ " in a slot conflict:\n\n") @@ -4585,6 +4585,9 @@ class depgraph(object): # as an unsatisfied dependency. self._unsatisfied_deps_for_display.append( ((dep.root, dep.atom), {"myparent":dep.parent})) + self._slot_collision_info.add((pkg.slot_atom, pkg.root)) + self._slot_collision_nodes.add(pkg) + self.digraph.addnode(pkg, myparent, priority=priority) return 0 if pkg in self._slot_collision_nodes: |