diff options
| author |   Arfrever Frehtes Taifersar Arahesis <Arfrever@Gentoo.Org> | 2010-08-16 18:11:06 +0200 |
|---|---|---|
| committer | Arfrever Frehtes Taifersar Arahesis <Arfrever@Gentoo.Org> | 2010-08-16 18:11:06 +0200 |
| commit | 10e78f24f72aee03f6a66ada1bd83d8ea191446b (patch) | |
| tree | 2078a0fb1669473a2bd21e19e605d067d88e67e1 | |
| parent | Remove unused attributes from classes. (diff) | |
| download | portage-10e78f24f72aee03f6a66ada1bd83d8ea191446b.tar.gz portage-10e78f24f72aee03f6a66ada1bd83d8ea191446b.tar.bz2 portage-10e78f24f72aee03f6a66ada1bd83d8ea191446b.zip | |
Ensure that PORTAGE_PYTHON isn't a symlink.
| -rw-r--r-- | pym/portage/package/ebuild/doebuild.py | 2 | ||||
| -rw-r--r-- | pym/portage/tests/ebuild/test_doebuild_spawn.py | 2 | ||||
| -rw-r--r-- | pym/portage/tests/ebuild/test_ipc_daemon.py | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/pym/portage/package/ebuild/doebuild.py b/pym/portage/package/ebuild/doebuild.py index bcac378d4..0b580e6d5 100644 --- 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 842bb45f0..3b6ccdedc 100644 --- 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 5a5f860fb..a17760394 100644 --- 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 |