From 2cd135139ffa8899118db75ea9d9901f38a74d92 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sun, 16 Nov 2008 07:29:04 +0000 Subject: When a "slot conflict" occurs due to USE dependencies, display the usual slot conflict output together with the unsatisfied USE dependency output, since both might be useful. (trunk r11960) svn path=/main/branches/2.1.6/; revision=11961 --- pym/_emerge/__init__.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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: -- cgit v1.2.3-1-g7c22