[kernel] r13161 - people/waldi/utils/kconfigeditor2/lib/kconfigeditor

[Bastian Blank]

Author: waldi
Date: Tue Mar 17 18:56:43 2009
New Revision: 13161

Log:
lib/kconfigeditor/package.py: Ignore disabled entries.


Modified:
   people/waldi/utils/kconfigeditor2/lib/kconfigeditor/package.py

Modified: people/waldi/utils/kconfigeditor2/lib/kconfigeditor/package.py
==============================================================================
--- people/waldi/utils/kconfigeditor2/lib/kconfigeditor/package.py	(original)
+++ people/waldi/utils/kconfigeditor2/lib/kconfigeditor/package.py	Tue Mar 17 18:56:43 2009
@@ -34,8 +34,13 @@
                 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 @@
         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 @@
                 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