From e089d1161da7e51f78a49a23c290cfcc30ee2457 Mon Sep 17 00:00:00 2001
From: aamine <aamine@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sat, 3 Mar 2007 13:53:38 +0000
Subject: * lib/fileutils.rb (mv): could not move directory between different
 file systems. [ruby-dev:30411]

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

(limited to 'lib/fileutils.rb')

diff --git a/lib/fileutils.rb b/lib/fileutils.rb
index 4da9b56fb6..386ea35f81 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
-- 
cgit v1.2.3