Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
checklink: always close the NamedTemporaryFile
authorAugie Fackler <raf@durin42.com>
Wed, 15 Oct 2014 15:13:43 -0400
changeset 22946 77c121da6143
parent 22945 3232f92360d4
child 22947 c63a09b6b337
checklink: always close the NamedTemporaryFile This fixes test-patchbomb.t when using pypy with --pure.
mercurial/posix.py file | annotate | diff | comparison | revisions 
--- a/mercurial/posix.py	Mon Oct 13 11:46:04 2014 +0200
+++ b/mercurial/posix.py	Wed Oct 15 15:13:43 2014 -0400
@@ -156,9 +156,12 @@
     name = tempfile.mktemp(dir=path, prefix='hg-checklink-')
     try:
         fd = tempfile.NamedTemporaryFile(dir=path, prefix='hg-checklink-')
-        os.symlink(os.path.basename(fd.name), name)
-        os.unlink(name)
-        return True
+        try:
+            os.symlink(os.path.basename(fd.name), name)
+            os.unlink(name)
+            return True
+        finally:
+            fd.close()
     except AttributeError:
         return False
     except OSError, inst:
Mercurial