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 931FC138CEE for ; Sun, 5 Jul 2015 16:33:34 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BE65EE091D; Sun, 5 Jul 2015 16:33:10 +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 63E02E091D for ; Sun, 5 Jul 2015 16:33:10 +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 456693408BA for ; Sun, 5 Jul 2015 16:33:09 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D748A739 for ; Sun, 5 Jul 2015 16:33:06 +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: <1436114134.d87fae8b90e536410e9cdb3b91cbaf436752e947.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: d87fae8b90e536410e9cdb3b91cbaf436752e947 X-VCS-Branch: master Date: Sun, 5 Jul 2015 16:33:06 +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: ab23112e-1a6a-4006-bb38-eaec93144e8a X-Archives-Hash: 9186253845ab60050fa834b5c66b8fb2 commit: d87fae8b90e536410e9cdb3b91cbaf436752e947 Author: Anthony G. Basile gentoo org> AuthorDate: Sun Jul 5 16:35:34 2015 +0000 Commit: Anthony G. Basile gentoo org> CommitDate: Sun Jul 5 16:35:34 2015 +0000 URL: https://gitweb.gentoo.org/proj/grss.git/commit/?id=d87fae8b make-worldconf: cleanup config file format. make-worldconf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/make-worldconf b/make-worldconf index 9408aef..c991817 100755 --- a/make-worldconf +++ b/make-worldconf @@ -93,7 +93,7 @@ def from_etc_portage(config, p, subdir): (subdir, re.sub('[/:]', '_', p.slot_atom))) if os.path.isfile(fpath): with open(fpath, 'r') as g: - config[p.slot_atom][subdir] = g.read() + config[p.slot_atom][subdir] = g.read().strip() def main(): @@ -124,10 +124,10 @@ def main(): keywords(config, p) # Others - these are read out of /etc/portage - from_etc_portage(config, p, 'env') - from_etc_portage(config, p, 'package.env') from_etc_portage(config, p, 'package.mask') from_etc_portage(config, p, 'package.unmask') + from_etc_portage(config, p, 'package.env') + from_etc_portage(config, p, 'env') # Remove any empty sections if config[p.slot_atom] == {}: