From: Zac Medico <zmedico@gentoo.org>
Date: Fri, 12 May 2006 21:40:42 +0000 (-0000)
Subject: Make /etc/portage/bashrc relative to PORTAGE_CONFIGROOT.
X-Git-Tag: v2.1_rc1
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=12bb9694170e7074697eed829e14dd2086368963;p=portage.git

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 fb7679d59..09aec9786 100644
--- 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"):