Revert hack for incorrect error when rename across devices.

jruby · May 13, 2018 · da420c9 · da420c9
1 parent 44bd17d
commit da420c9
Showing 1 changed file with 1 addition and 10 deletions.
diff --git a/lib/ruby/stdlib/fileutils.rb b/lib/ruby/stdlib/fileutils.rb
@@ -469,7 +469,7 @@ def mv(src, dest, force: nil, noop: nil, verbose: nil, secure: nil)
         end
         begin
           File.rename s, d
-        rescue *MV_RESCUES
+        rescue EXDEV
           copy_entry s, d, true
           if secure
             remove_entry_secure s, force
@@ -484,15 +484,6 @@ def mv(src, dest, force: nil, noop: nil, verbose: nil, secure: nil)
   end
   module_function :mv
 
-  # JRuby raises EACCES because JDK reports errors differently
-  MV_RESCUES = begin
-    if RUBY_ENGINE == 'jruby'
-      [Errno::EXDEV, Errno::EACCES]
-    else
-      [Errno::EXDEV]
-    end
-  end
-
   alias move mv
   module_function :move