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 4b5f7d8198f2d9dac661151fc4cefc2539250eda..8262f1f9fd2d591df59b8862c0948f6a1d982504 100644 (file)
--- 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 = {}