Remove redundant processing of ROOT and PORTAGE_CONFIGROOT for cloned config instances.

svn path=/main/trunk/; revision=3960

diff --git a/pym/portage.py b/pym/portage.py
index 5edf09ad990e62b1463fd76243826cdb84d88c1e..584d07a46c0e96ee504a269f9891206d99446380 100644 (file)
--- 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):