* [gentoo-commits] portage r11960 - main/trunk/pym/_emerge
@ 2008-11-16 7:26 Zac Medico (zmedico)
0 siblings, 0 replies; only message in thread
From: Zac Medico (zmedico) @ 2008-11-16 7:26 UTC (permalink / raw
To: gentoo-commits
Author: zmedico
Date: 2008-11-16 07:26:12 +0000 (Sun, 16 Nov 2008)
New Revision: 11960
Modified:
main/trunk/pym/_emerge/__init__.py
Log:
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.
Modified: main/trunk/pym/_emerge/__init__.py
===================================================================
--- main/trunk/pym/_emerge/__init__.py 2008-11-15 23:15:12 UTC (rev 11959)
+++ main/trunk/pym/_emerge/__init__.py 2008-11-16 07:26:12 UTC (rev 11960)
@@ -4330,7 +4330,7 @@
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")
@@ -4601,6 +4601,9 @@
# 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:
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2008-11-16 7:26 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-11-16 7:26 [gentoo-commits] portage r11960 - main/trunk/pym/_emerge Zac Medico (zmedico)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox