[kernel] r10811 - people/waldi/utils/kconfigeditor2/lib/kconfigeditor/kconfig/package

[Bastian Blank]

Author: waldi
Date: Tue Mar 11 18:40:35 2008
New Revision: 10811

Log:
lib/kconfigeditor/kconfig/package/files.py: Dump duplicated symbols correctly.


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

Modified: people/waldi/utils/kconfigeditor2/lib/kconfigeditor/kconfig/package/files.py
==============================================================================
--- people/waldi/utils/kconfigeditor2/lib/kconfigeditor/kconfig/package/files.py	(original)
+++ people/waldi/utils/kconfigeditor2/lib/kconfigeditor/kconfig/package/files.py	Tue Mar 11 18:40:35 2008
@@ -110,15 +110,17 @@
 
         self.read(fd)
 
-    def _dump_file(self, processed, f):
+    def _dump_file(self, processed, ignored, f):
         ret = []
         for i in f:
             if isinstance(i, FileConfig):
                 e = self.get(i.name, None)
                 if e is not None:
-                    processed.add(i.name)
                     if i.prompt:
+                        processed.add(i.name)
                         ret.append(e)
+                    else:
+                        ignored.add(i.name)
         if ret:
             ret[0:0] = ["##", "## file: %s" % f.filename, "##"]
             ret.append('')
@@ -142,11 +144,12 @@
 
         ret = []
         processed = set()
+        ignored = set()
         for f in menufiles:
-            ret.extend(self._dump_file(processed, f))
+            ret.extend(self._dump_file(processed, ignored, f))
 
         s = set(self.keys())
-        unprocessed = s - processed
+        unprocessed = s - processed - ignored
         if unprocessed:
             ret.extend(["##", "## file: unknown", "##"])
             for i in unprocessed: