summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoraamine <aamine@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-01-19 13:22:13 +0000
committeraamine <aamine@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-01-19 13:22:13 +0000
commit3efb9e43b63217dfd4743c0b06cda791f7b27894 (patch)
tree74bae85e2e3848112e785a69b5ca55d55c4d6688
parent835d90b94ec66ecaf4ff4c54e080e50555c1ed3a (diff)
* lib/fileutils.rb (mv): should remove file after copying. [ruby-dev:28223]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9846 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--lib/fileutils.rb1
2 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index d89a082cfa..dfee893aa4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Jan 19 22:19:18 2006 Minero Aoki <aamine@loveruby.net>
+
+ * lib/fileutils.rb (mv): should remove file after copying.
+ [ruby-dev:28223]
+
Wed Jan 18 23:37:06 2006 Tanaka Akira <akr@m17n.org>
* eval.c (FUNCTION_CALL_MAY_RETURN_TWICE): don't clobber %l7 of SPARC
diff --git a/lib/fileutils.rb b/lib/fileutils.rb
index 646cfe07d3..3e7989a287 100644
--- a/lib/fileutils.rb
+++ b/lib/fileutils.rb
@@ -500,6 +500,7 @@ module FileUtils
File.rename s, d
rescue Errno::EXDEV
copy_entry s, d, true
+ File.unlink s
end
rescue SystemCallError
raise unless options[:force]