As requested by wolf31o2, use the ROOT setting from make.conf as long as

it's not overridden by the calling environment.

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

diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index 0560f6c7a38c1abe8cde4e7d9418b9c81bc51525..04f7acec016f272eb3ba083ccd46006d3465cb84 100644 (file)
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -1259,13 +1259,8 @@ class config(object):
                                self.mygcfg.pop(k, None)
                        
                        # Allow ROOT setting to come from make.conf if it's not overridden
-                       # by the constructor argument (from the calling environment).  As a
-                       # special exception for a very common use case, config_root == "/"
-                       # implies that ROOT in make.conf should be ignored.  That way, the
-                       # user can chroot into $ROOT and the ROOT setting in make.conf will
-                       # be automatically ignored (unless config_root is other than "/").
-                       if config_root != "/" and \
-                               target_root is None and "ROOT" in self.mygcfg:
+                       # by the constructor argument (from the calling environment).
+                       if target_root is None and "ROOT" in self.mygcfg:
                                target_root = self.mygcfg["ROOT"]
                        
                        self.configlist.append(self.mygcfg)