From fb7e6c1f0eafddfa91aee2344857d7df1df959c2 Mon Sep 17 00:00:00 2001 From: "Chris St. Pierre" Date: Fri, 28 Sep 2012 14:37:56 -0400 Subject: Revert "POSIX: make sure to close file handles on temp files" This reverts commit a51d908d2fb08353c8aae349932c892d42f550c9. The file descriptor is closed when the file object created by os.fdopen goes out of scope. --- src/lib/Bcfg2/Client/Tools/POSIX/File.py | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) (limited to 'src/lib/Bcfg2/Client') diff --git a/src/lib/Bcfg2/Client/Tools/POSIX/File.py b/src/lib/Bcfg2/Client/Tools/POSIX/File.py index 558d360b1..40aade818 100644 --- a/src/lib/Bcfg2/Client/Tools/POSIX/File.py +++ b/src/lib/Bcfg2/Client/Tools/POSIX/File.py @@ -107,16 +107,13 @@ class POSIXFile(POSIXTool): (os.path.dirname(entry.get('name')), err)) return False try: - try: - os.fdopen(newfd, 'w').write(filedata) - except (OSError, IOError): - err = sys.exc_info()[1] - self.logger.error("POSIX: Failed to open temp file %s for " - "writing %s: %s" % - (newfile, entry.get("name"), err)) - return False - finally: - os.close(newfd) + os.fdopen(newfd, 'w').write(filedata) + except (OSError, IOError): + err = sys.exc_info()[1] + self.logger.error("POSIX: Failed to open temp file %s for writing " + "%s: %s" % + (newfile, entry.get("name"), err)) + return False return newfile def _rename_tmpfile(self, newfile, entry): -- cgit v1.2.3-1-g7c22