diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-09-28 14:37:56 -0400 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-09-28 14:37:56 -0400 |
| commit | fb7e6c1f0eafddfa91aee2344857d7df1df959c2 (patch) | |
| tree | abac5292ecec189837fa8c95dfb4fb43a2793b17 /src | |
| parent | 253ea79f511051ab8a1501a161d1d8c04b837919 (diff) | |
| download | bcfg2-fb7e6c1f0eafddfa91aee2344857d7df1df959c2.tar.gz bcfg2-fb7e6c1f0eafddfa91aee2344857d7df1df959c2.tar.bz2 bcfg2-fb7e6c1f0eafddfa91aee2344857d7df1df959c2.zip | |
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.
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/Bcfg2/Client/Tools/POSIX/File.py | 17 |
1 files changed, 7 insertions, 10 deletions
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): |