saveNomergeFavorites: fix possible root confusion
authorZac Medico <zmedico@gentoo.org>
Mon, 20 Dec 2010 15:47:48 +0000 (07:47 -0800)
committerZac Medico <zmedico@gentoo.org>
Mon, 20 Dec 2010 15:48:23 +0000 (07:48 -0800)
pym/_emerge/depgraph.py

index 6f200649ebf05a09c12b032b31858a9db98c448d..74b835523992c931c7f6f0ed00c36746b0360794 100644 (file)
@@ -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: