summaryrefslogtreecommitdiffstats
path: root/pym/portage/tests/bin
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2011-12-08 20:58:33 -0800
committerZac Medico <zmedico@gentoo.org>2011-12-08 20:58:54 -0800
commit12f18ab6ae8d732a39924536f585dc5ab7af8bbd (patch)
tree7a71fea6a4441c03817da42b67ec91b611cbe3c6 /pym/portage/tests/bin
parent4e87ba4eb94c0ad1615c9926650a8925d5688393 (diff)
downloadportage-12f18ab6ae8d732a39924536f585dc5ab7af8bbd.tar.gz
portage-12f18ab6ae8d732a39924536f585dc5ab7af8bbd.tar.bz2
portage-12f18ab6ae8d732a39924536f585dc5ab7af8bbd.zip
tests/bin: sanitize env
This fixes interference from FEATURES=force-prefix in the env.
Diffstat (limited to 'pym/portage/tests/bin')
-rw-r--r--pym/portage/tests/bin/setup_env.py6
1 files 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())