[kernel] r13140 - people/waldi/utils/kconfigeditor2/lib/kconfigeditor/kconfig
Bastian Blank
waldi at alioth.debian.org
Mon Mar 16 22:26:55 UTC 2009
Author: waldi
Date: Mon Mar 16 22:26:54 2009
New Revision: 13140
Log:
Cleanup symbol ignore.
Modified:
people/waldi/utils/kconfigeditor2/lib/kconfigeditor/kconfig/config.py
Modified: people/waldi/utils/kconfigeditor2/lib/kconfigeditor/kconfig/config.py
==============================================================================
--- people/waldi/utils/kconfigeditor2/lib/kconfigeditor/kconfig/config.py (original)
+++ people/waldi/utils/kconfigeditor2/lib/kconfigeditor/kconfig/config.py Mon Mar 16 22:26:54 2009
@@ -15,13 +15,12 @@
visible = self._write_check_visible(menufiles)
processed = set()
- ignored = set()
for file in menufiles:
- for i in self._write_file(processed, ignored, visible, file):
+ for i in self._write_file(processed, visible, file):
yield i
- unprocessed = set(self) - processed - ignored
+ unprocessed = set(self) - processed
if unprocessed:
yield '##'
yield '## file: unknown'
@@ -32,14 +31,14 @@
yield str(self.get(name))
yield ''
- def _write_file(self, processed, ignored, visible, file):
+ def _write_file(self, processed, visible, file):
ret = []
for entry in file:
if isinstance(entry, MenuEntryConfig):
- ret.extend(self._write_entry_config(processed, ignored, visible, entry))
+ ret.extend(self._write_entry_config(processed, visible, entry))
elif isinstance(entry, MenuEntryChoice):
- ret.extend(self._write_entry_choice(processed, ignored, visible, entry))
+ ret.extend(self._write_entry_choice(processed, visible, entry))
if ret:
yield '##'
@@ -49,13 +48,13 @@
yield i
yield ''
- def _write_entry_choice(self, processed, ignored, visible, entry):
+ def _write_entry_choice(self, processed, visible, entry):
ret = []
nr = 0
for subentry in entry:
if isinstance(subentry, MenuEntryConfig):
- r = list(self._write_entry_config(processed, ignored, visible, subentry))
+ r = list(self._write_entry_config(processed, visible, subentry))
ret.extend(r)
if r:
nr += 1
@@ -71,23 +70,21 @@
yield i
yield '## end choice'
- def _write_entry_config(self, processed, ignored, visible, entry):
- value = self.get(entry.name)
- if value is None:
- return
-
+ def _write_entry_config(self, processed, visible, entry):
if entry.name in processed:
return
+ if not entry.name in visible:
+ processed.add(entry.name)
+ return
- if not entry.prompt:
- if entry.name in visible:
- return
- ignored.add(entry.name)
+ value = self.get(entry.name)
+ if value is None:
return
- processed.add(entry.name)
- for i in value.write():
- yield i
+ if entry.prompt:
+ processed.add(entry.name)
+ for i in value.write():
+ yield i
def _write_check_visible(self, menufiles):
ret = set()
@@ -102,8 +99,7 @@
yield i
for menuentry in flatten():
- entry = self.get(menuentry.name)
- if entry and menuentry.prompt:
+ if menuentry.prompt:
ret.add(menuentry.name)
return ret
More information about the Kernel-svn-changes
mailing list