From bbb61dae0317ddd49c7db550e87f5231d60fdb7e Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Fri, 16 Dec 2011 15:29:24 -0800 Subject: [PATCH] tests/emerge: PORTAGE_GRPNAME/USERNAME make.conf --- pym/portage/tests/emerge/test_simple.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pym/portage/tests/emerge/test_simple.py b/pym/portage/tests/emerge/test_simple.py index 86919509d..28ac09843 100644 --- a/pym/portage/tests/emerge/test_simple.py +++ b/pym/portage/tests/emerge/test_simple.py @@ -276,6 +276,8 @@ pkg_preinst() { make_conf = ( "FEATURES=\"%s\"\n" % (" ".join(features),), "PORTDIR=\"%s\"\n" % (portdir,), + "PORTAGE_GRPNAME=\"%s\"\n" % (os.environ["PORTAGE_GRPNAME"],), + "PORTAGE_USERNAME=\"%s\"\n" % (os.environ["PORTAGE_USERNAME"],), ) path = os.environ.get("PATH") @@ -309,12 +311,10 @@ pkg_preinst() { "INFOPATH" : "", "PATH" : path, "PKGDIR" : pkgdir, - "PORTAGE_GRPNAME" : os.environ["PORTAGE_GRPNAME"], "PORTAGE_INST_GID" : str(portage.data.portage_gid), "PORTAGE_INST_UID" : str(portage.data.portage_uid), "PORTAGE_PYTHON" : portage_python, "PORTAGE_TMPDIR" : portage_tmpdir, - "PORTAGE_USERNAME" : os.environ["PORTAGE_USERNAME"], "PYTHONPATH" : pythonpath, } -- 2.26.2