From 12f18ab6ae8d732a39924536f585dc5ab7af8bbd Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Thu, 8 Dec 2011 20:58:33 -0800 Subject: [PATCH] tests/bin: sanitize env This fixes interference from FEATURES=force-prefix in the env. --- pym/portage/tests/bin/setup_env.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pym/portage/tests/bin/setup_env.py b/pym/portage/tests/bin/setup_env.py index f57a68560..1f8554e42 100644 --- a/pym/portage/tests/bin/setup_env.py +++ b/pym/portage/tests/bin/setup_env.py @@ -1,5 +1,5 @@ # setup_env.py -- Make sure bin subdir has sane env for testing -# Copyright 2007-2010 Gentoo Foundation +# Copyright 2007-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 import tempfile @@ -29,13 +29,13 @@ def binTestsInit(): binTestsCleanup() global basedir, env basedir = tempfile.mkdtemp() - env = os.environ.copy() + env = {} env["EAPI"] = "0" env["D"] = os.path.join(basedir, "image") env["T"] = os.path.join(basedir, "temp") env["S"] = os.path.join(basedir, "workdir") env["PF"] = "portage-tests-0.09-r1" - env["PATH"] = bindir + ":" + env["PATH"] + env["PATH"] = bindir + ":" + os.environ["PATH"] env["PORTAGE_BIN_PATH"] = bindir env["PORTAGE_PYM_PATH"] = pymdir env["PORTAGE_INST_UID"] = str(os.getuid()) -- 2.26.2