From: Zac Medico <zmedico@gentoo.org>
Date: Sun, 11 Dec 2011 00:19:34 +0000 (-0800)
Subject: ResolverPlayground: don't nest sandbox
X-Git-Tag: v2.2.0_alpha80~5
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2b51a74bc093e476ece19d0a2194104585e4c903;p=portage.git

ResolverPlayground: don't nest sandbox
---

diff --git a/pym/portage/tests/resolver/ResolverPlayground.py b/pym/portage/tests/resolver/ResolverPlayground.py
index a18585508..201c5c4af 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'),
 		}
 
+		if os.environ.get("SANDBOX_ON") == "1":
+			# avoid problems from nested sandbox instances
+			env["FEATURES"] = "-sandbox"
+
 		# Pass along PORTAGE_USERNAME and PORTAGE_GRPNAME since they
 		# need to be inherited by ebuild subprocesses.
 		if 'PORTAGE_USERNAME' in os.environ: