new exception model

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

1 files changed, 8 insertions, 3 deletions

diff --git a/lib/pstore.rb b/lib/pstore.rb
index b93420d649..3f95e8c059 100644
--- a/lib/pstore.rb
+++ b/lib/pstore.rb
@@ -15,7 +15,8 @@
 require "marshal"
 
 class PStore
-  Exception(:Error)
+  class Error < StandardError
+  end
 
   def initialize(file)
     dir = File::dirname(file)
@@ -90,13 +91,17 @@ class PStore
 	end
       ensure
 	unless @abort
-	  File::rename @filename, @filename+"~"
+	  begin
+	    File::rename @filename, @filename+"~"
+	  rescue Errno::ENOENT
+	    no_orig = true
+	  end
 	  begin
 	    File::open(@filename, "w") do |file|
 	      Marshal::dump(@table, file)
 	    end
 	  rescue
-	    File::rename @filename+"~", @filename
+	    File::rename @filename+"~", @filename unless no_orig
 	  end
 	end
 	@abort = false