[kernel-team] 16/86: lib/kconfigeditor/kconfig/package/files.py: Dump duplicated symbols correctly.

[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 26c52e5e2460315ab585d873d388a8f21b215476
Author: Bastian Blank <waldi at debian.org>
Date:   Tue Mar 11 18:40:35 2008 +0000

    lib/kconfigeditor/kconfig/package/files.py: Dump duplicated symbols correctly.
    
    svn path=/people/waldi/utils/kconfigeditor2/; revision=10811
---
 .../kconfigeditor2/lib/kconfigeditor/kconfig/package/files.py | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/utils/kconfigeditor2/lib/kconfigeditor/kconfig/package/files.py b/utils/kconfigeditor2/lib/kconfigeditor/kconfig/package/files.py
index b4177d6..7d8fda2 100644
--- a/utils/kconfigeditor2/lib/kconfigeditor/kconfig/package/files.py
+++ b/utils/kconfigeditor2/lib/kconfigeditor/kconfig/package/files.py
@@ -110,15 +110,17 @@ class File(dict):
 
         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 @@ class File(dict):
 
         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:

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