[patch] vdb dir move cross-device patch

vdb-dir-move.patch (text/plain), 1.10 KB, created by Barnabás Virágh on 2021-10-03 20:43:26 UTC

--- portage-utils-0.92/qmerge.c.old     2021-10-03 21:32:06.715771439 +0200
+++ portage-utils-0.92/qmerge.c 2021-10-03 22:05:38.777204309 +0200
@@ -1514,8 +1514,16 @@
                mkdir_p(buf, 0755);
                strcat(buf, mpkg->atom->PF);
                rm_rf(buf);  /* get rid of existing dir, empty dir is fine */
-               if (rename("vdb", buf) != 0)
-                       warn("failed to move 'vdb' to '%s': %s", buf, strerror(errno));
+               if (rename("vdb", buf) != 0) {
+                       /* In case of cross-device rename, use BusyBox mv instead (copy-delete) */
+                       if (errno == EXDEV) {
+                               snprintf(buf, sizeof(buf), "mv vdb %s%s/%s/%s",
+                                           portroot, portvdb, mpkg->atom->CATEGORY, mpkg->atom->PF);
+                               xsystem(buf);
+                       } else {
+                               warn("failed to move 'vdb' to '%s': %s", buf, strerror(errno));
+                       }
+               }
        }

        /* clean up our local temp dir */