From a51d908d2fb08353c8aae349932c892d42f550c9 Mon Sep 17 00:00:00 2001 From: "Chris St. Pierre" Date: Fri, 28 Sep 2012 12:17:28 -0400 Subject: POSIX: make sure to close file handles on temp files --- src/lib/Bcfg2/Client/Tools/POSIX/File.py | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) (limited to 'src/lib/Bcfg2/Client/Tools/POSIX/File.py') diff --git a/src/lib/Bcfg2/Client/Tools/POSIX/File.py b/src/lib/Bcfg2/Client/Tools/POSIX/File.py index 40aade818..558d360b1 100644 --- a/src/lib/Bcfg2/Client/Tools/POSIX/File.py +++ b/src/lib/Bcfg2/Client/Tools/POSIX/File.py @@ -107,13 +107,16 @@ class POSIXFile(POSIXTool): (os.path.dirname(entry.get('name')), err)) return False 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 + 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) return newfile def _rename_tmpfile(self, newfile, entry): -- cgit v1.2.3-1-g7c22