From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1RZXBP-0002Oz-Sq for garchives@archives.gentoo.org; Sun, 11 Dec 2011 00:22:24 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 99D8121C174; Sun, 11 Dec 2011 00:22:16 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 6726521C174 for ; Sun, 11 Dec 2011 00:22:16 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id ED48F1B4008 for ; Sun, 11 Dec 2011 00:22:15 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 4226B80042 for ; Sun, 11 Dec 2011 00:22:15 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <2b51a74bc093e476ece19d0a2194104585e4c903.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 X-VCS-Directories: pym/portage/tests/resolver/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 2b51a74bc093e476ece19d0a2194104585e4c903 Date: Sun, 11 Dec 2011 00:22:15 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 0fa74570-4fe0-45b3-9e2d-7dedb5ee6cf4 X-Archives-Hash: 7aca7c10b73fa630edd448b83c91a089 commit: 2b51a74bc093e476ece19d0a2194104585e4c903 Author: Zac Medico gentoo org> AuthorDate: Sun Dec 11 00:19:34 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Sun Dec 11 00:19:34 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D2b51a74b ResolverPlayground: don't nest sandbox --- pym/portage/tests/resolver/ResolverPlayground.py | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/pym/portage/tests/resolver/ResolverPlayground.py b/pym/porta= ge/tests/resolver/ResolverPlayground.py index a185855..201c5c4 100644 --- a/pym/portage/tests/resolver/ResolverPlayground.py +++ b/pym/portage/tests/resolver/ResolverPlayground.py @@ -483,6 +483,10 @@ class ResolverPlayground(object): 'PORTAGE_TMPDIR' : os.path.join(self.eroot, 'var/tmp'), } =20 + if os.environ.get("SANDBOX_ON") =3D=3D "1": + # avoid problems from nested sandbox instances + env["FEATURES"] =3D "-sandbox" + # Pass along PORTAGE_USERNAME and PORTAGE_GRPNAME since they # need to be inherited by ebuild subprocesses. if 'PORTAGE_USERNAME' in os.environ: