[kernel-team] 68/86: lib/kconfigeditor/package.py - Add schema override. - Handle kernelarch specific config files.

[debian-kernel at lists.debian.org]

This is an automated email from the git hooks/post-receive script.

benh pushed a commit to branch benh/kconfigeditor2
in repository kernel-team.

commit 4fd747a35bd793589f50c376bc58bfe33561f36a
Author: Bastian Blank <waldi at debian.org>
Date:   Tue Nov 27 18:52:21 2012 +0000

    lib/kconfigeditor/package.py
    - Add schema override.
    - Handle kernelarch specific config files.
    
    svn path=/people/waldi/utils/kconfigeditor2/; revision=19553
---
 utils/kconfigeditor2/lib/kconfigeditor/package.py | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/utils/kconfigeditor2/lib/kconfigeditor/package.py b/utils/kconfigeditor2/lib/kconfigeditor/package.py
index 82fe076..adcfea1 100644
--- a/utils/kconfigeditor2/lib/kconfigeditor/package.py
+++ b/utils/kconfigeditor2/lib/kconfigeditor/package.py
@@ -28,8 +28,15 @@ class Package(object):
 
         data = imp.find_module('config', [os.path.join(root, 'debian', 'lib', 'python', 'debian_linux')])
         module = imp.load_module('config', *data)
+
+        config_schema = {
+            'image': {
+                'configs': module.SchemaItemList(),
+            },
+        }
+
         self.config_root = os.path.join(root, "debian/config")
-        self.config = module.ConfigCoreHierarchy([self.config_root])
+        self.config = module.ConfigCoreHierarchy(config_schema, (self.config_root, ))
 
         self.files = files = {}
 
@@ -61,6 +68,9 @@ class Package(object):
         for filename in self._check_config("%s/config" % arch, arch):
             yield filename, key, kernelarch
 
+        for filename in self._check_config("kernelarch-%s/config" % kernelarch, arch):
+            yield filename, key, kernelarch
+
         for featureset in self.config['base', arch].get('featuresets', ()):
             for data in self._collect_featureset(arch, featureset):
                 yield data

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/kernel-team.git