summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2009-07-29 07:04:41 +0000
committerZac Medico <zmedico@gentoo.org>2009-07-29 07:04:41 +0000
commitc9bc664886338a9ea58ef18e2d0ed14dd2616e4c (patch)
tree3bfeb8c0e5ba346fa2fa046efc42478395704bff
parent413116a40273096192dcda27f38ef3e84161a141 (diff)
downloadportage-c9bc664886338a9ea58ef18e2d0ed14dd2616e4c.tar.gz
portage-c9bc664886338a9ea58ef18e2d0ed14dd2616e4c.tar.bz2
portage-c9bc664886338a9ea58ef18e2d0ed14dd2616e4c.zip
Account for $ROOT inside depgraph._show_missed_update_unsatisfied_dep().
svn path=/main/trunk/; revision=13854
-rw-r--r--pym/_emerge/depgraph.py7
1 files changed, 3 insertions, 4 deletions
diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py
index 2418ca521..8a9c59d5c 100644
--- a/pym/_emerge/depgraph.py
+++ b/pym/_emerge/depgraph.py
@@ -325,9 +325,8 @@ class depgraph(object):
write(str(pkg.slot_atom))
write("\n")
- for parent, atom in parent_atoms:
- # TODO: Account for which $ROOT the atom applies to.
- self._show_unsatisfied_dep(parent.root, atom, myparent=parent)
+ for parent, root, atom in parent_atoms:
+ self._show_unsatisfied_dep(root, atom, myparent=parent)
write("\n")
sys.stderr.flush()
@@ -719,7 +718,7 @@ class depgraph(object):
if dep_pkg is None:
self._dynamic_config._runtime_pkg_mask.setdefault(
dep.parent, {})["missing dependency"] = \
- set([(dep.parent, dep.atom)])
+ set([(dep.parent, dep.root, dep.atom)])
self._dynamic_config._need_restart = True
return 0