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