Move final file if in same file system, not only in same directory

Chia-Network · Apr 21, 2021 · 3c574f1 · 3c574f1
1 parent ce6ccc2
commit 3c574f1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -25,3 +25,4 @@ build
 .mypy_cache
 *.whl
 venv
+/.vs
diff --git a/src/plotter_disk.hpp b/src/plotter_disk.hpp
@@ -369,7 +369,9 @@ class DiskPlotter {
         Timer copy;
         do {
             std::error_code ec;
-            if (tmp_2_filename.parent_path() == final_filename.parent_path()) {
+            bool same_filesystem =
+                fs::equivalent(tmp_2_filename.parent_path(), final_filename.parent_path(), ec);
+            if (ec.value() == 0 && same_filesystem) {
                 fs::rename(tmp_2_filename, final_filename, ec);
                 if (ec.value() != 0) {
                     std::cout << "Could not rename " << tmp_2_filename << " to " << final_filename
-Original file line number
+Diff line change
@@ Expand Up / @@ -25,3 +25,4 @@ build @@
     .mypy_cache
     *.whl
     venv
+    /.vs