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 1RZqVt-0001Vg-0M for garchives@archives.gentoo.org; Sun, 11 Dec 2011 21:00:49 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 845A6E05F1; Sun, 11 Dec 2011 21:00:40 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 4EAB7E05F1 for ; Sun, 11 Dec 2011 21:00:40 +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 C8F3D1B4011 for ; Sun, 11 Dec 2011 21:00:39 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id B2FAE8004A for ; Sun, 11 Dec 2011 21:00:38 +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: Subject: [gentoo-commits] proj/portage:master commit in: pym/portage/tests/emerge/, pym/portage/tests/repoman/ X-VCS-Repository: proj/portage X-VCS-Files: pym/portage/tests/emerge/test_simple.py pym/portage/tests/repoman/test_simple.py X-VCS-Directories: pym/portage/tests/emerge/ pym/portage/tests/repoman/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: bffe72d567e2d4d4235ad45177fbec04da5260fa Date: Sun, 11 Dec 2011 21:00:38 +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: 92582ee3-40ae-4013-87be-ba08d13861d1 X-Archives-Hash: d4aa99521f7d8dae3f6f3098e76e2107 commit: bffe72d567e2d4d4235ad45177fbec04da5260fa Author: Zac Medico gentoo org> AuthorDate: Sun Dec 11 21:00:28 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Sun Dec 11 21:00:28 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3Dbffe72d5 Don't nest sandbox in emerge/repoman tests. --- pym/portage/tests/emerge/test_simple.py | 3 ++- pym/portage/tests/repoman/test_simple.py | 4 ++++ 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/pym/portage/tests/emerge/test_simple.py b/pym/portage/tests/= emerge/test_simple.py index 5177229..a3efa62 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 =3D os.path.join(os.sep, eprefix, USER_CONFIG_PATH) =20 features =3D [] - if not portage.process.sandbox_capable: + if not portage.process.sandbox_capable or \ + os.environ.get("SANDBOX_ON") =3D=3D "1": features.append("-sandbox") =20 # 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 3643ff2..eab06d9 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, } =20 + if os.environ.get("SANDBOX_ON") =3D=3D "1": + # avoid problems from nested sandbox instances + env["FEATURES"] =3D "-sandbox" + dirs =3D [homedir, license_dir, profiles_dir, distdir] try: for d in dirs: