[kernel-team] 48/86: lib/kconfigeditor/package.py: Ignore disabled entries.

[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 cbc465e28a3ee99cf7525e82be7ea0877ed3d8c8
Author: Bastian Blank <waldi at debian.org>
Date:   Tue Mar 17 18:56:43 2009 +0000

    lib/kconfigeditor/package.py: Ignore disabled entries.
    
    svn path=/people/waldi/utils/kconfigeditor2/; revision=13161
---
 utils/kconfigeditor2/lib/kconfigeditor/package.py | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/utils/kconfigeditor2/lib/kconfigeditor/package.py b/utils/kconfigeditor2/lib/kconfigeditor/package.py
index 577dacb..0ff57aa 100644
--- a/utils/kconfigeditor2/lib/kconfigeditor/package.py
+++ b/utils/kconfigeditor2/lib/kconfigeditor/package.py
@@ -34,8 +34,13 @@ class Package(object):
                 yield data
 
     def _collect_arch(self, arch):
+        config_entry = self.config.merge('base', arch)
+
+        if not config_entry.get('enabled', True):
+            return
+
         key = arch,
-        kernelarch = self.config.merge('base', arch).get('kernel-arch')
+        kernelarch = config_entry.get('kernel-arch')
 
         for filename in self._check_config("%s/config" % arch, arch):
             yield filename, key, kernelarch
@@ -49,8 +54,13 @@ class Package(object):
         if featureset != 'none':
             return
 
+        config_entry = self.config.merge('base', arch, featureset)
+
+        if not config_entry.get('enabled', True):
+            return
+
         key = arch, featureset
-        kernelarch = self.config.merge('base', arch, featureset).get('kernel-arch')
+        kernelarch = config_entry.get('kernel-arch')
 
         for filename in self._check_config("featureset-%s/config" % featureset, None, featureset):
             yield filename, key, kernelarch
@@ -62,8 +72,13 @@ class Package(object):
                 yield data
 
     def _collect_flavour(self, arch, featureset, flavour):
+        config_entry = self.config.merge('base', arch, featureset, flavour)
+
+        if not config_entry.get('enabled', True):
+            return
+
         key = arch, featureset, flavour
-        kernelarch = self.config.merge('base', arch, featureset, flavour).get('kernel-arch')
+        kernelarch = config_entry.get('kernel-arch')
 
         for filename in self._check_config("%s/config.%s" % (arch, flavour), arch, None, flavour):
             yield filename, key, kernelarch

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