From 857238ebbfb51ab5000dca5a6a7918fb59622c56 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Wed, 28 Nov 2007 23:50:51 +0000 Subject: 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 --- pym/portage/__init__.py | 9 +++++++-- 1 file 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 = { -- cgit v1.2.3-1-g7c22