From: Zac Medico <zmedico@gentoo.org>
Date: Sun, 11 Dec 2011 21:00:28 +0000 (-0800)
Subject: Don't nest sandbox in emerge/repoman tests.
X-Git-Tag: v2.2.0_alpha81~20
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=bffe72d567e2d4d4235ad45177fbec04da5260fa;p=portage.git

Don't nest sandbox in emerge/repoman tests.
---

diff --git a/pym/portage/tests/emerge/test_simple.py b/pym/portage/tests/emerge/test_simple.py
index 5177229ac..a3efa62ca 100644
--- a/pym/portage/tests/emerge/test_simple.py
+++ b/pym/portage/tests/emerge/test_simple.py
@@ -267,7 +267,8 @@ pkg_preinst() {
 		user_config_dir = os.path.join(os.sep, eprefix, USER_CONFIG_PATH)
 
 		features = []
-		if not portage.process.sandbox_capable:
+		if not portage.process.sandbox_capable or \
+			os.environ.get("SANDBOX_ON") == "1":
 			features.append("-sandbox")
 
 		# Since egencache ignores settings from the calling environment,
diff --git a/pym/portage/tests/repoman/test_simple.py b/pym/portage/tests/repoman/test_simple.py
index 3643ff2d7..eab06d9b8 100644
--- a/pym/portage/tests/repoman/test_simple.py
+++ b/pym/portage/tests/repoman/test_simple.py
@@ -196,6 +196,10 @@ class SimpleRepomanTestCase(TestCase):
 			"PYTHONPATH" : pythonpath,
 		}
 
+		if os.environ.get("SANDBOX_ON") == "1":
+			# avoid problems from nested sandbox instances
+			env["FEATURES"] = "-sandbox"
+
 		dirs = [homedir, license_dir, profiles_dir, distdir]
 		try:
 			for d in dirs: