| 1 |
Author: zmedico |
| 2 |
Date: 2009-07-29 07:04:41 +0000 (Wed, 29 Jul 2009) |
| 3 |
New Revision: 13854 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/pym/_emerge/depgraph.py |
| 7 |
Log: |
| 8 |
Account for $ROOT inside depgraph._show_missed_update_unsatisfied_dep(). |
| 9 |
|
| 10 |
|
| 11 |
Modified: main/trunk/pym/_emerge/depgraph.py |
| 12 |
=================================================================== |
| 13 |
--- main/trunk/pym/_emerge/depgraph.py 2009-07-28 23:32:19 UTC (rev 13853) |
| 14 |
+++ main/trunk/pym/_emerge/depgraph.py 2009-07-29 07:04:41 UTC (rev 13854) |
| 15 |
@@ -325,9 +325,8 @@ |
| 16 |
write(str(pkg.slot_atom)) |
| 17 |
write("\n") |
| 18 |
|
| 19 |
- for parent, atom in parent_atoms: |
| 20 |
- # TODO: Account for which $ROOT the atom applies to. |
| 21 |
- self._show_unsatisfied_dep(parent.root, atom, myparent=parent) |
| 22 |
+ for parent, root, atom in parent_atoms: |
| 23 |
+ self._show_unsatisfied_dep(root, atom, myparent=parent) |
| 24 |
write("\n") |
| 25 |
|
| 26 |
sys.stderr.flush() |
| 27 |
@@ -719,7 +718,7 @@ |
| 28 |
if dep_pkg is None: |
| 29 |
self._dynamic_config._runtime_pkg_mask.setdefault( |
| 30 |
dep.parent, {})["missing dependency"] = \ |
| 31 |
- set([(dep.parent, dep.atom)]) |
| 32 |
+ set([(dep.parent, dep.root, dep.atom)]) |
| 33 |
self._dynamic_config._need_restart = True |
| 34 |
|
| 35 |
return 0 |
Archives