[kernel-team] 55/86: * bin/process.py: Update. * lib/kconfigeditor/kconfig/config.py: Support plain and menu sorted writing.

[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 451a9b3d5366269568ea7a036d0d8cd56a7ed6f1
Author: Bastian Blank <waldi at debian.org>
Date:   Thu Oct 29 11:38:53 2009 +0000

    * bin/process.py: Update.
    * lib/kconfigeditor/kconfig/config.py: Support plain and menu sorted writing.
    
    svn path=/people/waldi/utils/kconfigeditor2/; revision=14502
---
 utils/kconfigeditor2/bin/process.py                      | 2 +-
 utils/kconfigeditor2/lib/kconfigeditor/kconfig/config.py | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/utils/kconfigeditor2/bin/process.py b/utils/kconfigeditor2/bin/process.py
index 3d7c5a3..3114ac4 100755
--- a/utils/kconfigeditor2/bin/process.py
+++ b/utils/kconfigeditor2/bin/process.py
@@ -20,7 +20,7 @@ def main(package, source, config_output, ignore_silent):
         filename_tmp = filename + '.tmp'
         f = open(filename_tmp, 'w')
         try:
-            data['file'].write(f, menufiles)
+            data['file'].write_menu(f, menufiles)
             f.close()
             os.rename(filename_tmp, filename)
         except:
diff --git a/utils/kconfigeditor2/lib/kconfigeditor/kconfig/config.py b/utils/kconfigeditor2/lib/kconfigeditor/kconfig/config.py
index 44748d7..d69cdb8 100644
--- a/utils/kconfigeditor2/lib/kconfigeditor/kconfig/config.py
+++ b/utils/kconfigeditor2/lib/kconfigeditor/kconfig/config.py
@@ -103,7 +103,13 @@ class File(dict):
 
         return ret
 
-    def write(self, fd, menufiles, ignore_silent=False):
+    def write(self, fd):
+        keys = list(self.iterkeys())
+        keys.sort()
+        for name in keys:
+            fd.write(str(self.get(name)) + '\n')
+
+    def write_menu(self, fd, menufiles, ignore_silent=False):
         def menufiles_cmp_key(entry):
             filename_list = entry.filename.split('/')
             if filename_list[-1] == 'Kconfig':

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