yugui	2009-05-22 18:49:44 +0900 (Fri, 22 May 2009)

  New Revision: 23537

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=23537

  Log:
    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]

  Modified files:
    branches/ruby_1_9_1/ChangeLog
    branches/ruby_1_9_1/lib/tempfile.rb
    branches/ruby_1_9_1/version.h

Index: ruby_1_9_1/ChangeLog
===================================================================
--- ruby_1_9_1/ChangeLog	(revision 23536)
+++ ruby_1_9_1/ChangeLog	(revision 23537)
@@ -1,3 +1,8 @@
+Wed May 20 06:20:05 2009  Yukihiro Matsumoto  <matz@r...>
+
+	* lib/tempfile.rb (Tempfile#unlink): close first for Windows.  a
+	  patch from Florian Frank.  [ruby-core:23505]
+
 Wed May 20 00:05:52 2009  Yukihiro Matsumoto  <matz@r...>
 
 	* vm_method.c (rb_attr): should preserve encoding info.
Index: ruby_1_9_1/lib/tempfile.rb
===================================================================
--- ruby_1_9_1/lib/tempfile.rb	(revision 23536)
+++ ruby_1_9_1/lib/tempfile.rb	(revision 23537)
@@ -136,7 +136,10 @@
   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)
Index: ruby_1_9_1/version.h
===================================================================
--- ruby_1_9_1/version.h	(revision 23536)
+++ ruby_1_9_1/version.h	(revision 23537)
@@ -1,6 +1,6 @@
 #define RUBY_VERSION "1.9.1"
 #define RUBY_RELEASE_DATE "2009-05-12"
-#define RUBY_PATCHLEVEL 151
+#define RUBY_PATCHLEVEL 152
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/