diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-11-28 23:50:51 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-11-28 23:50:51 +0000 |
| commit | 857238ebbfb51ab5000dca5a6a7918fb59622c56 (patch) | |
| tree | bcb155e7d7532ee841096fd01f889a8cb4b6b96c | |
| parent | 27515bfa43d9d68327a42b140a16de1dd2f288b0 (diff) | |
| download | portage-857238ebbfb51ab5000dca5a6a7918fb59622c56.tar.gz portage-857238ebbfb51ab5000dca5a6a7918fb59622c56.tar.bz2 portage-857238ebbfb51ab5000dca5a6a7918fb59622c56.zip | |
In doebuild, fix paths to ebuild.sh and misc-functions.sh so
that they work with variable PORTAGE_BIN_PATH.
svn path=/main/trunk/; revision=8734
| -rw-r--r-- | pym/portage/__init__.py | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py index cd3f7517a..f16e2d4bd 100644 --- a/pym/portage/__init__.py +++ b/pym/portage/__init__.py @@ -4495,8 +4495,13 @@ def doebuild(myebuild, mydo, myroot, mysettings, debug=0, listonly=0, fakeroot = "fakeroot" in mysettings.features - ebuild_sh = EBUILD_SH_BINARY + " %s" - misc_sh = MISC_SH_BINARY + " dyn_%s" + # Note: PORTAGE_BIN_PATH may differ from the global + # constant when portage is reinstalling itself. + portage_bin_path = mysettings["PORTAGE_BIN_PATH"] + ebuild_sh = os.path.join(portage_bin_path, + os.path.basename(EBUILD_SH_BINARY)) + " %s" + misc_sh = os.path.join(portage_bin_path, + os.path.basename(MISC_SH_BINARY)) + " dyn_%s" # args are for the to spawn function actionmap = { |