summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2006-07-20 05:51:55 +0000
committerZac Medico <zmedico@gentoo.org>2006-07-20 05:51:55 +0000
commitc9d9a24e42de0bd8eebf07ad0267d1683e8cd45d (patch)
tree691ffaaaa055bed97dad76e9ee5e614ba860c54f
parent56cac6d25ba9d7aaec3edc1122ed4017fe8c5065 (diff)
downloadportage-c9d9a24e42de0bd8eebf07ad0267d1683e8cd45d.tar.gz
portage-c9d9a24e42de0bd8eebf07ad0267d1683e8cd45d.tar.bz2
portage-c9d9a24e42de0bd8eebf07ad0267d1683e8cd45d.zip
Remove redundant processing of ROOT and PORTAGE_CONFIGROOT for cloned config instances.
svn path=/main/trunk/; revision=3960
-rw-r--r--pym/portage.py12
1 files changed, 5 insertions, 7 deletions
diff --git a/pym/portage.py b/pym/portage.py
index 5edf09ad9..584d07a46 100644
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -894,8 +894,6 @@ class config:
self.uvlist = copy.deepcopy(clone.uvlist)
self.dirVirtuals = copy.deepcopy(clone.dirVirtuals)
self.treeVirtuals = copy.deepcopy(clone.treeVirtuals)
- config_root = self.backupenv["PORTAGE_CONFIGROOT"]
- target_root = self.backupenv["ROOT"]
else:
# backupenv is for calculated incremental variables.
@@ -1077,6 +1075,11 @@ class config:
self.lookuplist=self.configlist[:]
self.lookuplist.reverse()
+ self["PORTAGE_CONFIGROOT"] = config_root
+ self.backup_changes("PORTAGE_CONFIGROOT")
+ self["ROOT"] = target_root
+ self.backup_changes("ROOT")
+
self.pusedict = {}
self.pkeywordsdict = {}
self.punmaskdict = {}
@@ -1275,11 +1278,6 @@ 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):