| 1 |
Author: zmedico |
| 2 |
Date: 2008-03-05 19:01:29 +0000 (Wed, 05 Mar 2008) |
| 3 |
New Revision: 9439 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/pym/portage/__init__.py |
| 7 |
Log: |
| 8 |
As requested by wolf31o2, use the ROOT setting from make.conf as long as |
| 9 |
it's not overridden by the calling environment. |
| 10 |
|
| 11 |
|
| 12 |
Modified: main/trunk/pym/portage/__init__.py |
| 13 |
=================================================================== |
| 14 |
--- main/trunk/pym/portage/__init__.py 2008-03-05 09:34:37 UTC (rev 9438) |
| 15 |
+++ main/trunk/pym/portage/__init__.py 2008-03-05 19:01:29 UTC (rev 9439) |
| 16 |
@@ -1259,13 +1259,8 @@ |
| 17 |
self.mygcfg.pop(k, None) |
| 18 |
|
| 19 |
# Allow ROOT setting to come from make.conf if it's not overridden |
| 20 |
- # by the constructor argument (from the calling environment). As a |
| 21 |
- # special exception for a very common use case, config_root == "/" |
| 22 |
- # implies that ROOT in make.conf should be ignored. That way, the |
| 23 |
- # user can chroot into $ROOT and the ROOT setting in make.conf will |
| 24 |
- # be automatically ignored (unless config_root is other than "/"). |
| 25 |
- if config_root != "/" and \ |
| 26 |
- target_root is None and "ROOT" in self.mygcfg: |
| 27 |
+ # by the constructor argument (from the calling environment). |
| 28 |
+ if target_root is None and "ROOT" in self.mygcfg: |
| 29 |
target_root = self.mygcfg["ROOT"] |
| 30 |
|
| 31 |
self.configlist.append(self.mygcfg) |
| 32 |
|
| 33 |
-- |
| 34 |
gentoo-commits@l.g.o mailing list |
Archives