sftp: make move across drives possible

Fix #2704
iterative · Nov 1, 2019 · ab1ead8 · ab1ead8
1 parent d932405
commit ab1ead8
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/dvc/remote/ssh/connection.py b/dvc/remote/ssh/connection.py
@@ -185,8 +185,17 @@ def download(self, src, dest, no_progress_bar=False, progress_title=None):
             self.sftp.get(src, dest, callback=pbar.update_to)
 
     def move(self, src, dst):
+        """Use `SFTP RENAME` operation when possible, otherwise,
+        fallback to copy and remove, since the former one doesn't
+        work across drives.
+        """
         self.makedirs(posixpath.dirname(dst))
-        self.sftp.rename(src, dst)
+
+        try:
+            self.sftp.rename(src, dst)
+        except OSError:
+            self.copy(src, dst)
+            self.remove(src)
 
     def upload(self, src, dest, no_progress_bar=False, progress_title=None):
         self.makedirs(posixpath.dirname(dest))