From d0cb5c71ce3f179f14fddf5241cf0dcfe1599123 Mon Sep 17 00:00:00 2001 From: nobu Date: Mon, 29 Mar 2010 06:11:48 +0000 Subject: * lib/tempfile.rb (Tempfile#open): re-open with same mode and options as initialize. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@27086 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- lib/tempfile.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'lib/tempfile.rb') diff --git a/lib/tempfile.rb b/lib/tempfile.rb index e1bccf0a90..79dd5cc02c 100755 --- a/lib/tempfile.rb +++ b/lib/tempfile.rb @@ -138,6 +138,7 @@ class Tempfile < DelegateClass(File) if opts mode |= opts.delete(:mode) || 0 opts[:perm] = perm + perm = nil else opts = perm end @@ -148,6 +149,9 @@ class Tempfile < DelegateClass(File) ensure self.class.rmdir(lock) end + @mode = mode & ~(File::CREAT|File::EXCL) + perm or opts.freeze + @opts = opts end super(@tmpfile) @@ -156,7 +160,7 @@ class Tempfile < DelegateClass(File) # Opens or reopens the file with mode "r+". def open @tmpfile.close if @tmpfile - @tmpfile = File.open(@tmpname, 'r+') + @tmpfile = File.open(@tmpname, @mode, @opts) @data[1] = @tmpfile __setobj__(@tmpfile) end -- cgit v1.2.3