summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2008-03-05 19:01:29 +0000
committerZac Medico <zmedico@gentoo.org>2008-03-05 19:01:29 +0000
commit48835dee0622f07685617bd6d6952254e2434ec2 (patch)
tree4b60c00256cec41e8bc19fb162c6d82b2874b3c8
parent0d13e83d09d3bc4210d73a707ed491c0d4dcf533 (diff)
downloadportage-48835dee0622f07685617bd6d6952254e2434ec2.tar.gz
portage-48835dee0622f07685617bd6d6952254e2434ec2.tar.bz2
portage-48835dee0622f07685617bd6d6952254e2434ec2.zip
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
-rw-r--r--pym/portage/__init__.py9
1 files changed, 2 insertions, 7 deletions
diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index 0560f6c7a..04f7acec0 100644
--- 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)