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

[Anthony G. Basile]

commit:     7ef9c7af8d8043d659ff5024ed4f09725a0d4c77
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sun Jul  5 16:51:33 2015 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sun Jul  5 16:51:33 2015 +0000
URL:        https://gitweb.gentoo.org/proj/grss.git/commit/?id=7ef9c7af

grs/WorldConf.py: cleanup for new world.conf structure.

 grs/WorldConf.py | 30 +++++++++---------------------
 1 file changed, 9 insertions(+), 21 deletions(-)

diff --git a/grs/WorldConf.py b/grs/WorldConf.py
index f20609b..f9eefe8 100644
--- a/grs/WorldConf.py
+++ b/grs/WorldConf.py
@@ -14,31 +14,20 @@ class WorldConf():
     """
 
     @staticmethod
-    def conf2file(config, s, portage_confdir):
-        """ doc here
-            more doc
-        """
-        try:
-            for (f, v) in config[s].items():
-                filepath = os.path.join(portage_confdir, f)
-                dirpath  = os.path.dirname(filepath)
-                os.makedirs(dirpath, mode=0o755, exist_ok=True)
-                with open(filepath, 'w') as g:
-                    g.write('%s\n' % v)
-        except KeyError:
-            pass
-
-
-    @staticmethod
     def install():
         """ doc here
             more doc
         """
         config = configparser.RawConfigParser(delimiters=':', 
allow_no_value=True, comment_prefixes=None)
         config.read(CONST.WORLD_CONFIG)
-
         for s in config.sections():
-            WorldConf.conf2file(config, s, 
portage_confdir=CONST.PORTAGE_CONFIGDIR)
+            for (directory, value) in config[s].items():
+                p_slot_atom = re.sub('[/:]', '_', s)
+                fpath = os.path.join(CONST.PORTAGE_CONFIGDIR, '%s/%s' % 
(directory, p_slot_atom))
+                dpath  = os.path.dirname(fpath)
+                os.makedirs(dpath, mode=0o755, exist_ok=True)
+                with open(fpath, 'w') as g:
+                    g.write('%s\n' % value)
 
 
     @staticmethod
@@ -71,12 +60,11 @@ class WorldConf():
             # Only look at select files and directories.
             # TODO: This needs to be expanded.
             if not os.path.basename(dirpath) in ['env', 'package.env', \
-                    'package.accept_keywords', 'package.use', 'package.mask', \
-                    'package.unmask']:
+                    'package.accept_keywords', 'package.use', \
+                    'package.mask', 'package.unmask']:
                 continue
 
             for f in filenames:
                 fpath = os.path.realpath(os.path.join(dirpath, f))
                 if f in slot_atoms:
                     os.remove(fpath)
-                    continue