Ensure that PORTAGE_PYTHON isn't a symlink.

diff --git a/pym/portage/package/ebuild/doebuild.py b/pym/portage/package/ebuild/doebuild.py
index bcac378d4a0c1858a4b29acb42db5c364b5642da..0b580e6d58ffdd9c6ff1d86ac4d56a6ac562d494 100644 (file)
--- a/pym/portage/package/ebuild/doebuild.py
+++ b/pym/portage/package/ebuild/doebuild.py
@@ -105,7 +105,7 @@ def doebuild_environment(myebuild, mydo, myroot, mysettings,
        mysettings["PORTAGE_MASTER_PID"] = str(os.getpid())
 
        # Set requested Python interpreter for Portage helpers.
-       mysettings['PORTAGE_PYTHON'] = sys.executable
+       mysettings['PORTAGE_PYTHON'] = os.path.realpath(sys.executable)
 
        # We are disabling user-specific bashrc files.
        mysettings["BASH_ENV"] = INVALID_ENV_FILE

diff --git a/pym/portage/tests/ebuild/test_doebuild_spawn.py b/pym/portage/tests/ebuild/test_doebuild_spawn.py
index 842bb45f053a45ae4764f04ae336adf1252aa69f..3b6ccdedc867dc427f63b8da1bf32e96d5455e4f 100644 (file)
--- a/pym/portage/tests/ebuild/test_doebuild_spawn.py
+++ b/pym/portage/tests/ebuild/test_doebuild_spawn.py
@@ -38,7 +38,7 @@ class DoebuildSpawnTestCase(TestCase):
                                metadata=metadata, root_config=root_config,
                                type_name='ebuild')
                        settings.setcpv(pkg)
-                       settings['PORTAGE_PYTHON'] = sys.executable
+                       settings['PORTAGE_PYTHON'] = os.path.realpath(sys.executable)
                        settings['PORTAGE_BUILDDIR'] = os.path.join(
                                settings['PORTAGE_TMPDIR'], cpv)
                        settings['T'] = os.path.join(

diff --git a/pym/portage/tests/ebuild/test_ipc_daemon.py b/pym/portage/tests/ebuild/test_ipc_daemon.py
index 5a5f860fb1e487d5e81c575a33c0c983da19dd8f..a17760394f340bea98f0675b8f11a59aa3edb90a 100644 (file)
--- a/pym/portage/tests/ebuild/test_ipc_daemon.py
+++ b/pym/portage/tests/ebuild/test_ipc_daemon.py
@@ -28,7 +28,7 @@ class IpcDaemonTestCase(TestCase):
                        if 'PORTAGE_GRPNAME' in os.environ:
                                env['PORTAGE_GRPNAME'] = os.environ['PORTAGE_GRPNAME']
 
-                       env['PORTAGE_PYTHON'] = sys.executable
+                       env['PORTAGE_PYTHON'] = os.path.realpath(sys.executable)
                        env['PORTAGE_BIN_PATH'] = PORTAGE_BIN_PATH
                        env['PORTAGE_PYM_PATH'] = PORTAGE_PYM_PATH
                        env['PORTAGE_BUILDDIR'] = tmpdir