summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2010-12-20 07:47:48 -0800
committerZac Medico <zmedico@gentoo.org>2010-12-20 07:48:23 -0800
commitf1147977596d380bcedc90d36f84ee4dc825377b (patch)
treef54a74b230e68aa64d221127a6b91ab4cfa0e671
parent468d96a199bb39cf0d7dd5b36e21798e50f7b70e (diff)
downloadportage-f1147977596d380bcedc90d36f84ee4dc825377b.tar.gz
portage-f1147977596d380bcedc90d36f84ee4dc825377b.tar.bz2
portage-f1147977596d380bcedc90d36f84ee4dc825377b.zip
saveNomergeFavorites: fix possible root confusion
-rw-r--r--pym/_emerge/depgraph.py5
1 files changed, 5 insertions, 0 deletions
diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py
index 6f200649e..74b835523 100644
--- a/pym/_emerge/depgraph.py
+++ b/pym/_emerge/depgraph.py
@@ -4988,6 +4988,9 @@ class depgraph(object):
if pkg_status != "nomerge":
continue
+ if x.root != root_config.root:
+ continue
+
try:
myfavkey = create_world_atom(x, args_set, root_config)
if myfavkey:
@@ -5004,6 +5007,8 @@ class depgraph(object):
for arg in self._dynamic_config._initial_arg_list:
if not isinstance(arg, SetArg):
continue
+ if arg.root_config.root != root_config.root:
+ continue
k = arg.name
if k in ("selected", "world") or \
not root_config.sets[k].world_candidate: