[kernel-team] 30/86: lib/kconfigeditor/kconfig/package/files.py: Don't ignore silent options by default.

[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 ff44e87ebe9b9128b86a0c158b8464fbc64a90fd
Author: Bastian Blank <waldi at debian.org>
Date:   Fri Mar 14 11:24:11 2008 +0000

    lib/kconfigeditor/kconfig/package/files.py: Don't ignore silent options by default.
    
    svn path=/people/waldi/utils/kconfigeditor2/; revision=10836
---
 .../kconfigeditor2/lib/kconfigeditor/kconfig/package/files.py  | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/utils/kconfigeditor2/lib/kconfigeditor/kconfig/package/files.py b/utils/kconfigeditor2/lib/kconfigeditor/kconfig/package/files.py
index 289d38d..ecb79ac 100644
--- a/utils/kconfigeditor2/lib/kconfigeditor/kconfig/package/files.py
+++ b/utils/kconfigeditor2/lib/kconfigeditor/kconfig/package/files.py
@@ -126,11 +126,11 @@ class File(dict):
         if e is not None:
             if i.name in processed:
                 pass
-            elif i.prompt:
+            elif not i.prompt and ignored is not None:
+                ignored.add(i.name)
+            else:
                 processed.add(i.name)
                 ret.append(e)
-            else:
-                ignored.add(i.name)
         return ret
 
     def _dump_file(self, processed, ignored, f):
@@ -145,7 +145,7 @@ class File(dict):
             ret.append('')
         return ret
 
-    def dump(self, root, menufiles):
+    def dump(self, root, menufiles, ignore_silent = False):
         filename = os.path.join(root, self.filename)
         if not os.path.exists(os.path.dirname(filename)):
             os.makedirs(os.path.dirname(filename))
@@ -165,7 +165,7 @@ class File(dict):
         processed = set()
         ignored = set()
         for f in menufiles:
-            ret.extend(self._dump_file(processed, ignored, f))
+            ret.extend(self._dump_file(processed, ignore_silent and ignored or None, f))
 
         s = set(self.keys())
         unprocessed = s - processed - ignored

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