* lib/pstore.rb (PStore#transaction): get rid of opening in write mode

  when read only transaction.  [ruby-dev:23842]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@6558 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 3 insertions, 6 deletions

diff --git a/lib/pstore.rb b/lib/pstore.rb
index 25294fe009..c4c6dd56a5 100644
--- a/lib/pstore.rb
+++ b/lib/pstore.rb
@@ -97,18 +97,15 @@ class PStore
       new_file = @filename + ".new"
 
       content = nil
-      file = File.open(@filename, File::RDWR | File::CREAT)
       unless read_only
+        file = File.open(@filename, File::RDWR | File::CREAT)
         file.flock(File::LOCK_EX)
         commit_new(file) if FileTest.exist?(new_file)
         content = file.read()
       else
+        file = File.open(@filename, File::RDONLY)
         file.flock(File::LOCK_SH)
-        if FileTest.exist?(new_file)
-          File.open(new_file) {|fp| content = fp.read()}
-        else
-          content = file.read()
-        end
+        content = (File.read(new_file) rescue file.read())
       end
 
       if content != ""