diff options
| author | aamine <aamine@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-03-03 13:53:38 +0000 |
|---|---|---|
| committer | aamine <aamine@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-03-03 13:53:38 +0000 |
| commit | b9d980d4ba7fe0cee89abb49da4659bf69718205 (patch) | |
| tree | c01cc7eee80cc0b8f49f8fccb49b112871051a0e | |
| parent | db90961aa12b4c6939c8b63784df902bbf7a4927 (diff) | |
| download | ruby-b9d980d4ba7fe0cee89abb49da4659bf69718205.tar.gz ruby-b9d980d4ba7fe0cee89abb49da4659bf69718205.tar.xz ruby-b9d980d4ba7fe0cee89abb49da4659bf69718205.zip | |
* lib/fileutils.rb (mv): could not move directory between different file systems. [ruby-dev:30411]
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@11974 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | lib/fileutils.rb | 10 |
2 files changed, 12 insertions, 3 deletions
@@ -1,3 +1,8 @@ +Sat Mar 3 22:51:29 2007 Minero Aoki <aamine@loveruby.net> + + * lib/fileutils.rb (mv): could not move directory between + different file systems. [ruby-dev:30411] + Sat Mar 3 22:37:02 2007 Nobuyoshi Nakada <nobu@ruby-lang.org> * file.c (rb_file_s_utime): allow nil to set the current time. diff --git a/lib/fileutils.rb b/lib/fileutils.rb index 4da9b56fb..386ea35f8 100644 --- a/lib/fileutils.rb +++ b/lib/fileutils.rb @@ -1,7 +1,7 @@ # # = fileutils.rb # -# Copyright (c) 2000-2006 Minero Aoki +# Copyright (c) 2000-2007 Minero Aoki # # This program is free software. # You can distribute/modify this program under the same terms of ruby. @@ -504,7 +504,11 @@ module FileUtils File.rename s, d rescue Errno::EXDEV copy_entry s, d, true - File.unlink s + if options[:secure] + remove_entry_secure s, options[:force] + else + remove_entry s, options[:force] + end end rescue SystemCallError raise unless options[:force] @@ -517,7 +521,7 @@ module FileUtils module_function :move OPT_TABLE['mv'] = - OPT_TABLE['move'] = [:force, :noop, :verbose] + OPT_TABLE['move'] = [:force, :noop, :verbose, :secure] def rename_cannot_overwrite_file? #:nodoc: /djgpp|cygwin|mswin|mingw|bccwin|wince|emx/ =~ RUBY_PLATFORM |