From 7b9cd8c0b661f4a434fc262fc23da62fa69bf1ea Mon Sep 17 00:00:00 2001
From: yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Fri, 22 May 2009 09:49:44 +0000
Subject: merges r23494 from trunk into ruby_1_9_1. -- * lib/tempfile.rb
 (Tempfile#unlink): close first for Windows.  a   patch from Florian Frank. 
 [ruby-core:23505]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@23537 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 lib/tempfile.rb | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/tempfile.rb b/lib/tempfile.rb
index 601bb8d2f8..3319d4f886 100644
--- a/lib/tempfile.rb
+++ b/lib/tempfile.rb
@@ -136,7 +136,10 @@ class Tempfile < DelegateClass(File)
   def unlink
     # keep this order for thread safeness
     begin
-      File.unlink(@tmpname) if File.exist?(@tmpname)
+      if File.exist?(@tmpname)
+        closed? or close
+        File.unlink(@tmpname)
+      end
       @@cleanlist.delete(@tmpname)
       @data = @tmpname = nil
       ObjectSpace.undefine_finalizer(self)
-- 
cgit v1.2.3