ResolverPlayground: check targetroot in mergelist

diff --git a/pym/portage/tests/resolver/ResolverPlayground.py b/pym/portage/tests/resolver/ResolverPlayground.py
index a63d285a511b41ebb1e2b4c9b6f61271f8e73e4d..62aafb56eea6c2394d755ff52bd084b0c54435d5 100644 (file)
--- a/pym/portage/tests/resolver/ResolverPlayground.py
+++ b/pym/portage/tests/resolver/ResolverPlayground.py
@@ -707,6 +707,7 @@ class ResolverPlaygroundResult(object):
 
                if self.depgraph._dynamic_config._serialized_tasks_cache is not None:
                        self.mergelist = []
+                       host_root = self.depgraph._frozen_config._running_root.root
                        for x in self.depgraph._dynamic_config._serialized_tasks_cache:
                                if isinstance(x, Blocker):
                                        self.mergelist.append(x.atom)
@@ -721,6 +722,8 @@ class ResolverPlaygroundResult(object):
                                                else:
                                                        desc = x.operation
                                                mergelist_str = "[%s]%s" % (desc, mergelist_str)
+                                       if x.root != host_root:
+                                               mergelist_str += "{targetroot}"
                                        self.mergelist.append(mergelist_str)
 
                if self.depgraph._dynamic_config._needed_use_config_changes:

diff --git a/pym/portage/tests/resolver/test_targetroot.py b/pym/portage/tests/resolver/test_targetroot.py
index ef07a766113d5bcb8ed5789267a78adbed81494e..a79d2316e14809d00a59725918f372c7e13b9323 100644 (file)
--- a/pym/portage/tests/resolver/test_targetroot.py
+++ b/pym/portage/tests/resolver/test_targetroot.py
@@ -20,7 +20,7 @@ class TargetRootTestCase(TestCase):
                                ["dev-lang/python"],
                                options = {},
                                success = True,
-                               mergelist = ["dev-lang/python-3.2", "dev-lang/python-3.2"]),
+                               mergelist = ["dev-lang/python-3.2", "dev-lang/python-3.2{targetroot}"]),
                )
 
                playground = ResolverPlayground(ebuilds=ebuilds, targetroot=True,