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 D7405138CEE for ; Sun, 5 Jul 2015 12:40:50 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 46CC5E08E6; Sun, 5 Jul 2015 12:40:44 +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 D054DE08E6 for ; Sun, 5 Jul 2015 12:40:43 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C5BE1340896 for ; Sun, 5 Jul 2015 12:40:42 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B0DA6739 for ; Sun, 5 Jul 2015 12:40:40 +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: <1436100188.4ca8d87b69a8552da9e6ad575d831e6c9dab2e2b.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: 4ca8d87b69a8552da9e6ad575d831e6c9dab2e2b X-VCS-Branch: master Date: Sun, 5 Jul 2015 12:40:40 +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: 898f097d-6033-4096-9bce-df9079c1bc7c X-Archives-Hash: 055b778342ecef4fa3fc5dd8d93f2c32 commit: 4ca8d87b69a8552da9e6ad575d831e6c9dab2e2b Author: Anthony G. Basile gentoo org> AuthorDate: Sun Jul 5 12:43:08 2015 +0000 Commit: Anthony G. Basile gentoo org> CommitDate: Sun Jul 5 12:43:08 2015 +0000 URL: https://gitweb.gentoo.org/proj/grss.git/commit/?id=4ca8d87b make-worldconf: search package.{,un}mask make-worldconf | 30 ++++++++++++++++++++---------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/make-worldconf b/make-worldconf index 09de316..9f27266 100755 --- a/make-worldconf +++ b/make-worldconf @@ -89,21 +89,27 @@ def keywords(config, p): def envvars(config, p): - try: - fpath = os.path.join(CONST.PORTAGE_CONFIGDIR, 'package.env') + fpath = os.path.join(CONST.PORTAGE_CONFIGDIR, 'package.env') + if os.path.isfile(fpath): with open(fpath, 'r') as g: for l in g.readlines(): # This matching needs to be made more strick. if re.search('%s' % re.escape(p.cpv_split[1]), l): - config[p.slot_atom]['+package.env'] = '%s %s' % (p.slot_atom, - re.sub('[/:]', '_', p.slot_atom)) + p_slot_atom = re.sub('[/:]', '_', p.slot_atom) + config[p.slot_atom]['+package.env'] = '%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)) with open(env_file, 'r') as h: - config[p.slot_atom]['env/%s' % re.sub('[/:]', '_', p.slot_atom)] = h.read() - except FileNotFoundError: - pass + config[p.slot_atom]['env/%s' % p_slot_atom] = h.read() + + +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): + with open(fpath, 'r') as g: + config[p.slot_atom][rpath] = g.read() def main(): @@ -127,15 +133,19 @@ def main(): except AttributeError: continue - # Populate package.use + # Populate package.use - these are read out of p useflags(config, p) - # Populate package.accept_keywords + # Populate package.accept_keywords - these are read out of p keywords(config, p) - # Populate package.env and env/* + # Populate package.env and env/* - these are read out of /etc/portage envvars(config, p) + # Others - these are read out of /etc/portage + others(config, p, 'package.mask') + others(config, p, 'package.unmask') + # Remove any empty sections if config[p.slot_atom] == {}: config.remove_section(p.slot_atom)