diff options
| -rw-r--r-- | lib/tempfile.rb | 10 | ||||
| -rw-r--r-- | test/test_tempfile.rb | 6 |
2 files changed, 15 insertions, 1 deletions
diff --git a/lib/tempfile.rb b/lib/tempfile.rb index b36c6638b6..b6270b827a 100644 --- a/lib/tempfile.rb +++ b/lib/tempfile.rb @@ -334,8 +334,16 @@ def Tempfile.create(basename="", tmpdir=nil, mode: 0, **options) begin yield tmpfile ensure + if File.identical?(tmpfile, tmpfile.path) + unlinked = File.unlink tmpfile.path rescue nil + end tmpfile.close - File.unlink tmpfile + unless unlinked + begin + File.unlink tmpfile.path + rescue Errno::ENOENT + end + end end else tmpfile diff --git a/test/test_tempfile.rb b/test/test_tempfile.rb index a2b272747e..92ec988f63 100644 --- a/test/test_tempfile.rb +++ b/test/test_tempfile.rb @@ -343,6 +343,12 @@ puts Tempfile.new('foo').path assert_file.exist?(path) } assert_file.not_exist?(path) + + Tempfile.create("tempfile-create") {|f| + path = f.path + File.unlink(f.path) + } + assert_file.not_exist?(path) end def test_create_without_block |