From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 9DE55138010 for ; Wed, 26 Sep 2012 00:52:32 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 21ECD21C004; Wed, 26 Sep 2012 00:52:22 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id E58DD21C004 for ; Wed, 26 Sep 2012 00:52:21 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2B8A033D7AC for ; Wed, 26 Sep 2012 00:52:21 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id D6247E5444 for ; Wed, 26 Sep 2012 00:52:19 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <1348620728.15a7519049e47f726a37f985b7c4a559b47dae16.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/portage/tests/resolver/ X-VCS-Repository: proj/portage X-VCS-Files: pym/portage/tests/resolver/ResolverPlayground.py pym/portage/tests/resolver/test_targetroot.py X-VCS-Directories: pym/portage/tests/resolver/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 15a7519049e47f726a37f985b7c4a559b47dae16 X-VCS-Branch: master Date: Wed, 26 Sep 2012 00:52:19 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: cf15174b-c3f7-4160-bded-70c4b03f6065 X-Archives-Hash: a7811f60723c2a0ca0fea4371dab132e commit: 15a7519049e47f726a37f985b7c4a559b47dae16 Author: Zac Medico gentoo org> AuthorDate: Wed Sep 26 00:52:08 2012 +0000 Commit: Zac Medico gentoo 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,