Make /etc/portage/bashrc relative to PORTAGE_CONFIGROOT.

svn path=/main/trunk/; revision=3343

diff --git a/pym/portage.py b/pym/portage.py
index fb7679d59e7f6736e6ef9845b649f6ee8e8eeb9a..09aec97860a0e6fb21328bc164eb1ff79fd95249 100644 (file)
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -2477,7 +2477,8 @@ def doebuild_environment(myebuild, mydo, myroot, mysettings, debug, use_cache, m
        mysettings["D"] = os.path.join(mysettings["PORTAGE_BUILDDIR"], "image") + os.sep
        mysettings["T"] = os.path.join(mysettings["PORTAGE_BUILDDIR"], "temp")
 
-       mysettings["PORTAGE_BASHRC"] = EBUILD_SH_ENV_FILE
+       mysettings["PORTAGE_BASHRC"] = os.path.join(
+               mysettings["PORTAGE_CONFIGROOT"], EBUILD_SH_ENV_FILE.lstrip(os.path.sep))
 
        #set up KV variable -- DEP SPEEDUP :: Don't waste time. Keep var persistent.
        if (mydo!="depend") or not mysettings.has_key("KV"):