[gentoo-commits] proj/grss:master commit in: /

["Anthony G. Basile" <blueness@gentoo.org>]

commit:     d87fae8b90e536410e9cdb3b91cbaf436752e947
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sun Jul  5 16:35:34 2015 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> 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] == {}: