[kernel-team] 41/86: - Cleanup. - Write temporary files.

[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 5cb4f1a3cc7af2f01f39cd5350428002dc54cc10
Author: Bastian Blank <waldi at debian.org>
Date:   Mon Mar 16 20:53:51 2009 +0000

    - Cleanup.
    - Write temporary files.
    
    svn path=/people/waldi/utils/kconfigeditor2/; revision=13135
---
 utils/kconfigeditor2/bin/process.py                      | 11 ++++++++++-
 utils/kconfigeditor2/lib/kconfigeditor/kconfig/config.py |  9 ++-------
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/utils/kconfigeditor2/bin/process.py b/utils/kconfigeditor2/bin/process.py
index 3ef9341..d4694cf 100755
--- a/utils/kconfigeditor2/bin/process.py
+++ b/utils/kconfigeditor2/bin/process.py
@@ -25,7 +25,16 @@ def main(package, source, config_output, ignore_silent):
             menufiles = menu.files_all.values()
         else:
             menufiles = menu.files_arch[arch].values()
-        file.dump(config_output, menufiles, ignore_silent)
+
+        filename = os.path.join(config_output, file.filename)
+        filename_tmp = filename + '.tmp'
+        f = open(filename_tmp, 'w')
+        try:
+            file.write(f, menufiles, ignore_silent)
+            f.close()
+            os.rename(filename_tmp, filename)
+        except:
+            os.unlink(filename_tmp)
 
 if __name__ == '__main__':
     try:
diff --git a/utils/kconfigeditor2/lib/kconfigeditor/kconfig/config.py b/utils/kconfigeditor2/lib/kconfigeditor/kconfig/config.py
index 36ca4f5..612d011 100644
--- a/utils/kconfigeditor2/lib/kconfigeditor/kconfig/config.py
+++ b/utils/kconfigeditor2/lib/kconfigeditor/kconfig/config.py
@@ -72,12 +72,7 @@ class File(dict):
                     if isinstance(i1, MenuEntryConfig):
                         self._dump_prompt_file_config(have_prompt, i1)
 
-    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))
-        fd = file(filename, 'w')
-
+    def write(self, fd, menufiles, ignore_silent=False):
         def menufiles_cmp_key(entry):
             filename_list = entry.filename.split('/')
             if filename_list[-1] == 'Kconfig':
@@ -86,7 +81,7 @@ class File(dict):
                 filename_list[-1] = filename_list[-1].replace('Kconfig.', '')
             return filename_list
 
-        menufiles.sort(key = menufiles_cmp_key)
+        menufiles.sort(key=menufiles_cmp_key)
 
         have_prompt = set()
         for f in menufiles:

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