diff options
| author | Zac Medico <zmedico@gentoo.org> | 2008-11-16 07:29:04 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-11-16 07:29:04 +0000 |
| commit | 2cd135139ffa8899118db75ea9d9901f38a74d92 (patch) | |
| tree | 64efea233aa541a8d211207bfb25f1454bc323fb | |
| parent | 9756604663fe10a660b328de5dd450487ee5701b (diff) | |
| download | portage-2cd135139ffa8899118db75ea9d9901f38a74d92.tar.gz portage-2cd135139ffa8899118db75ea9d9901f38a74d92.tar.bz2 portage-2cd135139ffa8899118db75ea9d9901f38a74d92.zip | |
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
| -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: |