1 |
If PORTAGE_CONFIGROOT is not "/", this is likely to mean that we're not |
2 |
intended to be working on the live system (and, in fact, are probably |
3 |
making stuff that's incompatible with the live system). The user probably |
4 |
wants to use ROOT, but we ought to let the make.conf in the |
5 |
PORTAGE_CONFIGROOT set ROOT, so there's only one variable that the user |
6 |
needs to keep straight. |
7 |
|
8 |
I could do a bit more extensive version to check the config file's ROOT |
9 |
(if present) for being a directory, like the environment variable is |
10 |
checked, and to make the environment variable override the config file, if |
11 |
either of those is worthwhile. |
12 |
|
13 |
Signed-off-by: Daniel Barkalow <barkalow@××××××××.org> |
14 |
|
15 |
Index: pym/portage.py |
16 |
=================================================================== |
17 |
--- pym/portage.py (revision 5054) |
18 |
+++ pym/portage.py (working copy) |
19 |
@@ -1128,6 +1128,8 @@ |
20 |
noiselevel=-1) |
21 |
sys.exit(1) |
22 |
|
23 |
+ if config_root != "/" and "ROOT" in self.mygcfg: |
24 |
+ target_root = self.mygcfg["ROOT"] |
25 |
|
26 |
self.configlist.append(self.mygcfg) |
27 |
self.configdict["conf"]=self.configlist[-1] |
28 |
-- |
29 |
gentoo-portage-dev@g.o mailing list |