From 55179696b20fade5a994d711b6fba9901eeb839d Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 11 Nov 2009 21:42:40 +0000
Subject: * lib/tempfile.rb (Tempfile#initialize): option hash may not be  
 given.  [ruby-core:26681]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@25723 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 lib/tempfile.rb | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to 'lib')

diff --git a/lib/tempfile.rb b/lib/tempfile.rb
index 7024bd9bdb..b327acb62b 100755
--- a/lib/tempfile.rb
+++ b/lib/tempfile.rb
@@ -133,11 +133,17 @@ class Tempfile < DelegateClass(File)
 
     create(basename, *rest) do |tmpname, n, opts|
       lock = tmpname + '.lock'
-      mode = opts.delete(:mode) || 0
-      mode = File::RDWR|File::CREAT|File::EXCL|mode
+      mode = File::RDWR|File::CREAT|File::EXCL
+      perm = 0600
+      if opts
+        mode |= opts.delete(:mode) || 0
+        opts[:perm] = perm
+      else
+        opts = perm
+      end
       self.class.mkdir(lock)
       begin
-        @data[1] = @tmpfile = File.open(tmpname, mode, 0600, *opts)
+        @data[1] = @tmpfile = File.open(tmpname, mode, opts)
         @data[0] = @tmpname = tmpname
       ensure
         self.class.rmdir(lock)
-- 
cgit v1.2.3