diff options
| author | Zac Medico <zmedico@gentoo.org> | 2012-09-25 17:52:08 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2012-09-25 17:52:08 -0700 |
| commit | 15a7519049e47f726a37f985b7c4a559b47dae16 (patch) | |
| tree | 4d1255fa540d81672d0a9894699d4bee16317013 /pym/portage/tests | |
| parent | 893663df409d05dc32fc7fd461929068c3d4ccea (diff) | |
| download | portage-15a7519049e47f726a37f985b7c4a559b47dae16.tar.gz portage-15a7519049e47f726a37f985b7c4a559b47dae16.tar.bz2 portage-15a7519049e47f726a37f985b7c4a559b47dae16.zip | |
ResolverPlayground: check targetroot in mergelist
Diffstat (limited to 'pym/portage/tests')
| -rw-r--r-- | pym/portage/tests/resolver/ResolverPlayground.py | 3 | ||||
| -rw-r--r-- | pym/portage/tests/resolver/test_targetroot.py | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/pym/portage/tests/resolver/ResolverPlayground.py b/pym/portage/tests/resolver/ResolverPlayground.py index a63d285a5..62aafb56e 100644 --- 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 ef07a7661..a79d2316e 100644 --- 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, |