diff options
| author | Zac Medico <zmedico@gentoo.org> | 2010-08-16 09:25:32 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2010-08-16 09:25:32 -0700 |
| commit | 46404442fbeb4676248d725c4c7f4e7f30979ee0 (patch) | |
| tree | 8630547c865c4b5663e06ed61c91831c09091cfb | |
| parent | 56c90238b2a0664728d71e21dcf197324f5570bb (diff) | |
| parent | cedeeaee05aa1f256994696b4a195e586a80b9b0 (diff) | |
| download | portage-46404442fbeb4676248d725c4c7f4e7f30979ee0.tar.gz portage-46404442fbeb4676248d725c4c7f4e7f30979ee0.tar.bz2 portage-46404442fbeb4676248d725c4c7f4e7f30979ee0.zip | |
Merge branch 'master' of git+ssh://git.overlays.gentoo.org/proj/portage
| -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 506a6d185..8d40bf7ea 100644 --- a/pym/portage/tests/ebuild/test_doebuild_spawn.py +++ b/pym/portage/tests/ebuild/test_doebuild_spawn.py @@ -40,7 +40,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 |