From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 6A117138CEE for ; Sun, 5 Jul 2015 15:20:01 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C998CE0903; Sun, 5 Jul 2015 15:19:55 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 81F83E0903 for ; Sun, 5 Jul 2015 15:19:55 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5875234088A for ; Sun, 5 Jul 2015 15:19:54 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id AC28673C for ; Sun, 5 Jul 2015 15:19:52 +0000 (UTC) From: "Anthony G. Basile" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Anthony G. Basile" Message-ID: <1436109740.fc18c3375970978638680c0b7195deeecb6ae6ef.blueness@gentoo> Subject: [gentoo-commits] proj/grss:master commit in: / X-VCS-Repository: proj/grss X-VCS-Files: make-worldconf X-VCS-Directories: / X-VCS-Committer: blueness X-VCS-Committer-Name: Anthony G. Basile X-VCS-Revision: fc18c3375970978638680c0b7195deeecb6ae6ef X-VCS-Branch: master Date: Sun, 5 Jul 2015 15:19:52 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 8e89da02-5cb7-4514-bccf-74974633c61d X-Archives-Hash: 18ca6c7da9980d3cc692562c827bde12 commit: fc18c3375970978638680c0b7195deeecb6ae6ef Author: Anthony G. Basile gentoo org> AuthorDate: Sun Jul 5 15:22:20 2015 +0000 Commit: Anthony G. Basile gentoo 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()