|
Line
Link Here
|
| 0 |
-- portage-utils-0.92/qmerge.c.old 2021-10-03 21:32:06.715771439 +0200 |
0 |
++ portage-utils-0.92/qmerge.c 2021-10-03 22:05:38.777204309 +0200 |
|
Lines 1514-1521
Link Here
|
| 1514 |
mkdir_p(buf, 0755); |
1514 |
mkdir_p(buf, 0755); |
| 1515 |
strcat(buf, mpkg->atom->PF); |
1515 |
strcat(buf, mpkg->atom->PF); |
| 1516 |
rm_rf(buf); /* get rid of existing dir, empty dir is fine */ |
1516 |
rm_rf(buf); /* get rid of existing dir, empty dir is fine */ |
| 1517 |
if (rename("vdb", buf) != 0) |
1517 |
if (rename("vdb", buf) != 0) { |
| 1518 |
warn("failed to move 'vdb' to '%s': %s", buf, strerror(errno)); |
1518 |
/* In case of cross-device rename, use BusyBox mv instead (copy-delete) */ |
|
|
1519 |
if (errno == EXDEV) { |
| 1520 |
snprintf(buf, sizeof(buf), "mv vdb %s%s/%s/%s", |
| 1521 |
portroot, portvdb, mpkg->atom->CATEGORY, mpkg->atom->PF); |
| 1522 |
xsystem(buf); |
| 1523 |
} else { |
| 1524 |
warn("failed to move 'vdb' to '%s': %s", buf, strerror(errno)); |
| 1525 |
} |
| 1526 |
} |
| 1519 |
} |
1527 |
} |
| 1520 |
/* clean up our local temp dir */ |
1528 |
/* clean up our local temp dir */ |
