From: Fabian Groffen <grobian@gentoo.org>
Date: Tue, 20 Mar 2007 08:32:30 +0000 (-0000)
Subject: Also backup EPREFIX and EROOT, such that we can use those variables in
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=22fc9a31266d7632e90a994c3bcd106a706afdce;p=portage.git

Also backup EPREFIX and EROOT, such that we can use those variables in
e.g. pkg_config().


svn path=/main/branches/prefix/; revision=6250
---

diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index 4b5f7d819..8262f1f9f 100644
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -1168,7 +1168,8 @@ class config:
 			self.lookuplist.reverse()
 
 			# Blacklist vars that could interfere with portage internals.
-			for blacklisted in ["PKGUSE", "PORTAGE_CONFIGROOT", "ROOT"]:
+			for blacklisted in ["PKGUSE", "PORTAGE_CONFIGROOT", "ROOT",
+					"EPREFIX", "EROOT"]:
 				for cfg in self.lookuplist:
 					try:
 						del cfg[blacklisted]
@@ -1206,6 +1207,10 @@ class config:
 			self.backup_changes("PORTAGE_CONFIGROOT")
 			self["ROOT"] = target_root
 			self.backup_changes("ROOT")
+			self["EPREFIX"] = EPREFIX
+			self.backup_changes("EPREFIX")
+			self["EROOT"] = normalize_path(target_root + EPREFIX) + os.sep
+			self.backup_changes("EROOT")
 
 			self.pusedict = {}
 			self.pkeywordsdict = {}