[gentoo-commits] proj/portage:master commit in: pym/portage/tests/resolver/

["Zac Medico" <zmedico@gentoo.org>]

commit:     15a7519049e47f726a37f985b7c4a559b47dae16
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 26 00:52:08 2012 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Wed Sep 26 00:52:08 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=15a75190

ResolverPlayground: check targetroot in mergelist

---
 pym/portage/tests/resolver/ResolverPlayground.py |    3 +++
 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 a63d285..62aafb5 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 ef07a76..a79d231 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,