| 1 |
Author: zmedico |
| 2 |
Date: 2009-07-29 22:44:21 +0000 (Wed, 29 Jul 2009) |
| 3 |
New Revision: 13855 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/pym/_emerge/depgraph.py |
| 7 |
Log: |
| 8 |
Fix depgraph._show_missed_update() to keep each $ROOT separate. |
| 9 |
|
| 10 |
|
| 11 |
Modified: main/trunk/pym/_emerge/depgraph.py |
| 12 |
=================================================================== |
| 13 |
--- main/trunk/pym/_emerge/depgraph.py 2009-07-29 07:04:41 UTC (rev 13854) |
| 14 |
+++ main/trunk/pym/_emerge/depgraph.py 2009-07-29 22:44:21 UTC (rev 13855) |
| 15 |
@@ -285,15 +285,15 @@ |
| 16 |
# Exclude installed here since we only |
| 17 |
# want to show available updates. |
| 18 |
continue |
| 19 |
- if pkg.slot_atom in missed_updates: |
| 20 |
- other_pkg, mask_type, parent_atoms = \ |
| 21 |
- missed_updates[pkg.slot_atom] |
| 22 |
+ k = (pkg.root, pkg.slot_atom) |
| 23 |
+ if k in missed_updates: |
| 24 |
+ other_pkg, mask_type, parent_atoms = missed_updates[k] |
| 25 |
if other_pkg > pkg: |
| 26 |
continue |
| 27 |
for mask_type, parent_atoms in mask_reasons.iteritems(): |
| 28 |
if not parent_atoms: |
| 29 |
continue |
| 30 |
- missed_updates[pkg.slot_atom] = (pkg, mask_type, parent_atoms) |
| 31 |
+ missed_updates[k] = (pkg, mask_type, parent_atoms) |
| 32 |
break |
| 33 |
|
| 34 |
if not missed_updates: |
| 35 |
@@ -323,6 +323,8 @@ |
| 36 |
"due to unsatisfied dependencies:\n\n") |
| 37 |
|
| 38 |
write(str(pkg.slot_atom)) |
| 39 |
+ if pkg.root != '/': |
| 40 |
+ write(" for %s" % (pkg.root,)) |
| 41 |
write("\n") |
| 42 |
|
| 43 |
for parent, root, atom in parent_atoms: |
| 44 |
@@ -343,6 +345,8 @@ |
| 45 |
indent = " " |
| 46 |
for pkg, parent_atoms in missed_updates: |
| 47 |
msg.append(str(pkg.slot_atom)) |
| 48 |
+ if pkg.root != '/': |
| 49 |
+ msg.append(" for %s" % (pkg.root,)) |
| 50 |
msg.append("\n\n") |
| 51 |
|
| 52 |
for parent, atom in parent_atoms: |
Archives