diff options
author | knu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-02-12 07:54:28 +0000 |
---|---|---|
committer | knu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-02-12 07:54:28 +0000 |
commit | 66f39c771a78c44926b3aa4a1837f8af98ff14d7 (patch) | |
tree | c2ebb48fe7300b0b06b31ac940ee3f373eb45c52 | |
parent | c9fac6977bcea6d18a3d2e5abfb25dc29164c558 (diff) |
merge revision(s) 34413:
* lib/tempfile.rb (Tempfile#unlink, Tempfile::Remover#call): Just
call File.unlink and ignore ENOENT because existence check
before unlinking does not help in terms of race condition.
* lib/tempfile.rb (Tempfile#unlink, Tempfile::Remover#call): My
comment about thread safeness is obsolete.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34572 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 9 | ||||
-rw-r--r-- | lib/tempfile.rb | 33 | ||||
-rw-r--r-- | version.h | 2 |
3 files changed, 27 insertions, 17 deletions
@@ -1,3 +1,12 @@ +Sun Feb 12 16:53:18 2012 Akinori MUSHA <knu@iDaemons.org> + + * lib/tempfile.rb (Tempfile#unlink, Tempfile::Remover#call): Just + call File.unlink and ignore ENOENT because existence check + before unlinking does not help in terms of race condition. + + * lib/tempfile.rb (Tempfile#unlink, Tempfile::Remover#call): My + comment about thread safeness is obsolete. + Sun Feb 12 16:50:28 2012 Akinori MUSHA <knu@iDaemons.org> * lib/shellwords.rb: Fix rdoc markups. diff --git a/lib/tempfile.rb b/lib/tempfile.rb index 8a517d6746..b34251ebb6 100644 --- a/lib/tempfile.rb +++ b/lib/tempfile.rb @@ -227,18 +227,17 @@ class Tempfile < DelegateClass(File) # # to do so again. # end def unlink - # keep this order for thread safeness return unless @tmpname begin - if File.exist?(@tmpname) - File.unlink(@tmpname) - end - # remove tmpname from remover - @data[0] = @data[1] = nil - @tmpname = nil + File.unlink(@tmpname) + rescue Errno::ENOENT rescue Errno::EACCES # may not be able to unlink on Windows; just ignore + return end + # remove tmpname from remover + @data[0] = @data[1] = nil + @tmpname = nil end alias delete unlink @@ -270,20 +269,22 @@ class Tempfile < DelegateClass(File) end def call(*args) - if @pid == $$ - path, tmpfile = *@data + return if @pid != $$ - STDERR.print "removing ", path, "..." if $DEBUG + path, tmpfile = *@data - tmpfile.close if tmpfile + STDERR.print "removing ", path, "..." if $DEBUG - # keep this order for thread safeness - if path - File.unlink(path) if File.exist?(path) - end + tmpfile.close if tmpfile - STDERR.print "done\n" if $DEBUG + if path + begin + File.unlink(path) + rescue Errno::ENOENT + end end + + STDERR.print "done\n" if $DEBUG end end # :startdoc: @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.3" -#define RUBY_PATCHLEVEL 100 +#define RUBY_PATCHLEVEL 101 #define RUBY_RELEASE_DATE "2012-02-12" #define RUBY_RELEASE_YEAR 2012 |