From: Zac Medico <zmedico@gentoo.org>
Date: Mon, 20 Dec 2010 15:47:48 +0000 (-0800)
Subject: saveNomergeFavorites: fix possible root confusion
X-Git-Tag: v2.2.0_alpha10~6
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f9c2070525355bafc47f43d0074169afefd3497e;p=portage.git

saveNomergeFavorites: fix possible root confusion
---

diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py
index 7e47a4604..9a184d324 100644
--- a/pym/_emerge/depgraph.py
+++ b/pym/_emerge/depgraph.py
@@ -5037,6 +5037,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:
@@ -5053,6 +5056,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: