mirrors/uv
1
0
Fork 0
mirror of https://github.com/astral-sh/uv.git synced 2025-11-14 09:45:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Avoid attempting rename in copy fallback path (#1546)

Browse source 
## Summary

This _could_ fix https://github.com/astral-sh/uv/issues/1454, but I'm
not sure. I was able to replicate by forcing a bunch of error states.
But, in short, if we fail to hardlink on the initial copy due to a file
existing, and then fail _again_, we fallback to copying. But if we copy,
then the tempfile doesn't exist, and so the `fs_err::rename(&tempfile,
&out_path)?;` will fail with "File not found".

This PR just ensures that the cases are explicitly mutually exclusive:
we only attempt to rename if the hardlink succeeded.
This commit is contained in:
Charlie Marsh 2024-02-16 17:08:49 -05:00 • committed by GitHub
parent 8050370717
commit 4e0b6f8f84
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
crates/install-wheel-rs/src/linker.rs
View file

@ -416,11 +416,12 @@ fn hardlink_wheel_files(
// Removing and recreating would lead to race conditions. // Removing and recreating would lead to race conditions.
let tempdir = tempdir_in(&site_packages)?; let tempdir = tempdir_in(&site_packages)?;
let tempfile = tempdir.path().join(entry.file_name()); let tempfile = tempdir.path().join(entry.file_name());
if fs::hard_link(path, &tempfile).is_err() { if fs::hard_link(path, &tempfile).is_ok() {
fs_err::rename(&tempfile, &out_path)?;
} else {
fs::copy(path, &out_path)?; fs::copy(path, &out_path)?;
attempt = Attempt::UseCopyFallback; attempt = Attempt::UseCopyFallback;
} }
fs_err::rename(&tempfile, &out_path)?;
} else { } else {
fs::copy(path, &out_path)?; fs::copy(path, &out_path)?;
attempt = Attempt::UseCopyFallback; attempt = Attempt::UseCopyFallback;