Account for $ROOT inside depgraph._show_missed_update_unsatisfied_dep().
authorZac Medico <zmedico@gentoo.org>
Wed, 29 Jul 2009 07:04:41 +0000 (07:04 -0000)
committerZac Medico <zmedico@gentoo.org>
Wed, 29 Jul 2009 07:04:41 +0000 (07:04 -0000)
svn path=/main/trunk/; revision=13854

pym/_emerge/depgraph.py

index 2418ca521f7dfa7884adeea0a56007d1af0ce3ae..8a9c59d5c95a5410fdd149bedd093670b0e8f9d0 100644 (file)
@@ -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