From 48835dee0622f07685617bd6d6952254e2434ec2 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Wed, 5 Mar 2008 19:01:29 +0000 Subject: [PATCH] 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 --- pym/portage/__init__.py | 9 ++------- 1 file 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) -- 2.26.2