tests/emerge: PORTAGE_GRPNAME/USERNAME make.conf

diff --git a/pym/portage/tests/emerge/test_simple.py b/pym/portage/tests/emerge/test_simple.py
index 86919509d1a3d474088d1a642cd91cfad6065f3b..28ac098430f7ee044bdbf103602f40859dd3c374 100644 (file)
--- 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,
                }