From: Zac Medico <zmedico@gentoo.org>
Date: Sat, 6 May 2006 18:37:18 +0000 (-0000)
Subject: Fix portage.config handling of ROOT and PORTAGE_CONFIGROOT for bug #132442.
X-Git-Tag: v2.1_rc1~17
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5caaa7cc88d20b02574d8cb486ea999dacfdc116;p=portage.git

Fix portage.config handling of ROOT and PORTAGE_CONFIGROOT for bug #132442.

svn path=/main/trunk/; revision=3326
---

diff --git a/pym/portage.py b/pym/portage.py
index fd2f13640..0d9a0e5af 100644
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -977,9 +977,6 @@ class config:
 					writemsg("!!! Error: %s='%s' is not a directory. Please correct this.\n" % (k, v))
 					raise portage_exception.DirectoryNotFound(v)
 
-			self.backupenv["PORTAGE_CONFIGROOT"] = config_root
-			self.backupenv["ROOT"] = target_root
-
 			self.depcachedir = DEPCACHE_PATH
 
 			if not config_profile_path:
@@ -1329,6 +1326,11 @@ class config:
 		self.backupenv["PORTAGE_BIN_PATH"] = PORTAGE_BIN_PATH
 		self.backupenv["PORTAGE_PYM_PATH"] = PORTAGE_PYM_PATH
 
+		self["PORTAGE_CONFIGROOT"] = config_root
+		self.backup_changes("PORTAGE_CONFIGROOT")
+		self["ROOT"] = target_root
+		self.backup_changes("ROOT")
+
 		self._init_dirs()
 
 	def _init_dirs(self):