| 1 |
commit: d87fae8b90e536410e9cdb3b91cbaf436752e947 |
| 2 |
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Jul 5 16:35:34 2015 +0000 |
| 4 |
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Jul 5 16:35:34 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/grss.git/commit/?id=d87fae8b |
| 7 |
|
| 8 |
make-worldconf: cleanup config file format. |
| 9 |
|
| 10 |
make-worldconf | 6 +++--- |
| 11 |
1 file changed, 3 insertions(+), 3 deletions(-) |
| 12 |
|
| 13 |
diff --git a/make-worldconf b/make-worldconf |
| 14 |
index 9408aef..c991817 100755 |
| 15 |
--- a/make-worldconf |
| 16 |
+++ b/make-worldconf |
| 17 |
@@ -93,7 +93,7 @@ def from_etc_portage(config, p, subdir): |
| 18 |
(subdir, re.sub('[/:]', '_', p.slot_atom))) |
| 19 |
if os.path.isfile(fpath): |
| 20 |
with open(fpath, 'r') as g: |
| 21 |
- config[p.slot_atom][subdir] = g.read() |
| 22 |
+ config[p.slot_atom][subdir] = g.read().strip() |
| 23 |
|
| 24 |
|
| 25 |
def main(): |
| 26 |
@@ -124,10 +124,10 @@ def main(): |
| 27 |
keywords(config, p) |
| 28 |
|
| 29 |
# Others - these are read out of /etc/portage |
| 30 |
- from_etc_portage(config, p, 'env') |
| 31 |
- from_etc_portage(config, p, 'package.env') |
| 32 |
from_etc_portage(config, p, 'package.mask') |
| 33 |
from_etc_portage(config, p, 'package.unmask') |
| 34 |
+ from_etc_portage(config, p, 'package.env') |
| 35 |
+ from_etc_portage(config, p, 'env') |
| 36 |
|
| 37 |
# Remove any empty sections |
| 38 |
if config[p.slot_atom] == {}: |
Archives