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

[Bastian Blank]

Author: waldi
Date: Fri Mar 14 11:24:11 2008
New Revision: 10836

Log:
lib/kconfigeditor/kconfig/package/files.py: Don't ignore silent options by default.


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	Fri Mar 14 11:24:11 2008
@@ -126,11 +126,11 @@
         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 @@
             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 @@
         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