From: Zac Medico <zmedico@gentoo.org>
Date: Sun, 15 Aug 2010 08:18:19 +0000 (-0700)
Subject: Pass along PORTAGE_USERNAME and PORTAGE_GRPNAME since they
X-Git-Tag: v2.2_rc68~200
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=1555b4a2f1811e1e396c30e3db42b8044a4f98d9;p=portage.git

Pass along PORTAGE_USERNAME and PORTAGE_GRPNAME since they
need to be inherited by ebuild subprocesses.
---

diff --git a/pym/portage/tests/ebuild/test_ipc_daemon.py b/pym/portage/tests/ebuild/test_ipc_daemon.py
index f0d072aed..5a5f860fb 100644
--- a/pym/portage/tests/ebuild/test_ipc_daemon.py
+++ b/pym/portage/tests/ebuild/test_ipc_daemon.py
@@ -20,10 +20,19 @@ class IpcDaemonTestCase(TestCase):
 		tmpdir = tempfile.mkdtemp()
 		try:
 			env = {}
+
+			# Pass along PORTAGE_USERNAME and PORTAGE_GRPNAME since they
+			# need to be inherited by ebuild subprocesses.
+			if 'PORTAGE_USERNAME' in os.environ:
+				env['PORTAGE_USERNAME'] = os.environ['PORTAGE_USERNAME']
+			if 'PORTAGE_GRPNAME' in os.environ:
+				env['PORTAGE_GRPNAME'] = os.environ['PORTAGE_GRPNAME']
+
 			env['PORTAGE_PYTHON'] = sys.executable
 			env['PORTAGE_BIN_PATH'] = PORTAGE_BIN_PATH
 			env['PORTAGE_PYM_PATH'] = PORTAGE_PYM_PATH
 			env['PORTAGE_BUILDDIR'] = tmpdir
+
 			input_fifo = os.path.join(tmpdir, '.ipc_in')
 			output_fifo = os.path.join(tmpdir, '.ipc_out')
 			os.mkfifo(input_fifo)