1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

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
This commit is contained in:
yugui 2009-05-22 09:49:44 +00:00
parent a922df795b
commit 7b9cd8c0b6
3 changed files with 10 additions and 2 deletions

View file

@ -1,3 +1,8 @@
Wed May 20 06:20:05 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
* 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@ruby-lang.org>
* vm_method.c (rb_attr): should preserve encoding info.

View file

@ -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)

View file

@ -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