[kernel-team] 45/86: Cleanup symbol ignore.

[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 d6a4b14b2dd32077c91d96fe3aa92cc8ac18f9d2
Author: Bastian Blank <waldi at debian.org>
Date:   Mon Mar 16 22:26:54 2009 +0000

    Cleanup symbol ignore.
    
    svn path=/people/waldi/utils/kconfigeditor2/; revision=13140
---
 .../lib/kconfigeditor/kconfig/config.py            | 40 ++++++++++------------
 1 file changed, 18 insertions(+), 22 deletions(-)

diff --git a/utils/kconfigeditor2/lib/kconfigeditor/kconfig/config.py b/utils/kconfigeditor2/lib/kconfigeditor/kconfig/config.py
index 0011afa..7c36727 100644
--- a/utils/kconfigeditor2/lib/kconfigeditor/kconfig/config.py
+++ b/utils/kconfigeditor2/lib/kconfigeditor/kconfig/config.py
@@ -15,13 +15,12 @@ class File(dict):
         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 @@ class File(dict):
                 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 @@ class File(dict):
                 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 @@ class File(dict):
                 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 @@ class File(dict):
                             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

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