From 9f538c3be23771c00c1be764173a069d652e63c6 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Fri, 28 Mar 2008 11:47:59 +0000 Subject: As requested by wolf31o2, use the ROOT setting from make.conf as long as it's not overridden by the calling environment. (trunk r9439) svn path=/main/branches/2.1.2/; revision=9549 --- pym/portage.py | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/pym/portage.py b/pym/portage.py index 40156ca34..25789db80 100644 --- a/pym/portage.py +++ b/pym/portage.py @@ -1392,13 +1392,8 @@ class config: 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) -- cgit v1.2.3-1-g7c22