1 |
commit: fc18c3375970978638680c0b7195deeecb6ae6ef |
2 |
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Jul 5 15:22:20 2015 +0000 |
4 |
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Jul 5 15:22:20 2015 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/grss.git/commit/?id=fc18c337 |
7 |
|
8 |
make-worldconf: replace package.env file with directory. |
9 |
|
10 |
make-worldconf | 5 +++-- |
11 |
1 file changed, 3 insertions(+), 2 deletions(-) |
12 |
|
13 |
diff --git a/make-worldconf b/make-worldconf |
14 |
index 9f27266..4b962d4 100755 |
15 |
--- a/make-worldconf |
16 |
+++ b/make-worldconf |
17 |
@@ -96,7 +96,8 @@ def envvars(config, p): |
18 |
# This matching needs to be made more strick. |
19 |
if re.search('%s' % re.escape(p.cpv_split[1]), l): |
20 |
p_slot_atom = re.sub('[/:]', '_', p.slot_atom) |
21 |
- config[p.slot_atom]['+package.env'] = '%s %s' % (p.slot_atom, p_slot_atom) |
22 |
+ config[p.slot_atom]['package.env/%s' % p_slot_atom] = \ |
23 |
+ '%s %s' % (p.slot_atom, p_slot_atom) |
24 |
m = re.search('(\S+)\s+(\S+)', l) |
25 |
env_file = os.path.join(CONST.PORTAGE_CONFIGDIR, 'env') |
26 |
env_file = os.path.join(env_file, m.group(2)) |
27 |
@@ -107,7 +108,7 @@ def envvars(config, p): |
28 |
def others(config, p, subdir): |
29 |
rpath = '%s/%s' % (subdir, re.sub('[/:]', '_', p.slot_atom)) |
30 |
fpath = os.path.join(CONST.PORTAGE_CONFIGDIR, rpath) |
31 |
- if os.path.isile(fpath): |
32 |
+ if os.path.isfile(fpath): |
33 |
with open(fpath, 'r') as g: |
34 |
config[p.slot_atom][rpath] = g.read() |