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.1.9.26~5
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f1147977596d380bcedc90d36f84ee4dc825377b;p=portage.git

saveNomergeFavorites: fix possible root confusion
---

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: