|
Lines 4330-4336
Link Here
|
| 4330 |
self._show_merge_list() |
4330 |
self._show_merge_list() |
| 4331 |
|
4331 |
|
| 4332 |
msg = [] |
4332 |
msg = [] |
| 4333 |
msg.append("\n!!! Multiple versions within a single " + \ |
4333 |
msg.append("\n!!! Multiple package instances within a single " + \ |
| 4334 |
"package slot have been pulled\n") |
4334 |
"package slot have been pulled\n") |
| 4335 |
msg.append("!!! into the dependency graph, resulting" + \ |
4335 |
msg.append("!!! into the dependency graph, resulting" + \ |
| 4336 |
" in a slot conflict:\n\n") |
4336 |
" in a slot conflict:\n\n") |
|
Lines 4589-4594
Link Here
|
| 4589 |
priority=priority) |
4589 |
priority=priority) |
| 4590 |
return 1 |
4590 |
return 1 |
| 4591 |
else: |
4591 |
else: |
|
|
4592 |
|
| 4593 |
if pkg.cpv == existing_node.cpv and \ |
| 4594 |
dep.atom is not None and \ |
| 4595 |
dep.atom.use: |
| 4596 |
# Multiple different instances of the same version |
| 4597 |
# (typically one installed and another not yet |
| 4598 |
# installed) have been pulled into the graph due |
| 4599 |
# to a USE dependency. The "slot collision" display |
| 4600 |
# is not helpful in a case like this, so display it |
| 4601 |
# as an unsatisfied dependency. |
| 4602 |
self._unsatisfied_deps_for_display.append( |
| 4603 |
((dep.root, dep.atom), {"myparent":dep.parent})) |
| 4604 |
self._slot_collision_info.add((pkg.slot_atom, pkg.root)) |
| 4605 |
self._slot_collision_nodes.add(pkg) |
| 4606 |
self.digraph.addnode(pkg, myparent, priority=priority) |
| 4607 |
return 0 |
| 4608 |
|
| 4592 |
if pkg in self._slot_collision_nodes: |
4609 |
if pkg in self._slot_collision_nodes: |
| 4593 |
return 1 |
4610 |
return 1 |
| 4594 |
# A slot collision has occurred. Sometimes this coincides |
4611 |
# A slot collision has occurred. Sometimes this coincides |
