mirrors/uv
1
0
Fork 0
mirror of https://github.com/astral-sh/uv.git synced 2025-08-29 06:54:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Avoid canonicalizing executables on Windows (#5446)

Browse source 
## Summary

If you have an executable path on a network share path (like
`\\some-host\some-share\...\python.exe`), canonicalizing it adds the
`\\?` prefix, but dunce cannot safely strip it.

This PR changes the Windows logic to avoid canonicalizing altogether. We
don't really expect symlinks on Windows, so it seems unimportant to
resolve them.

Closes: https://github.com/astral-sh/uv/issues/5440.
This commit is contained in:
Charlie Marsh 2024-07-26 08:57:33 -04:00 • committed by GitHub
parent 967fcdbb83
commit 8b8f34ac21
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 26 additions and 125 deletions
Download patch file Download diff file Expand all files Collapse all files

17
crates/uv-python/src/interpreter.rs
View file

@ -709,24 +709,27 @@ impl InterpreterInfo {
/// unless the Python executable changes, so we use the executable's last modified
/// time as a cache key.
pub(crate) fn query_cached(executable: &Path, cache: &Cache) -> Result<Self, Error> {
let absolute = uv_fs::absolutize_path(executable)?;
let cache_entry = cache.entry(
CacheBucket::Interpreter,
"",
// We use the absolute path for the cache entry to avoid cache collisions for relative paths
// but we do not want to query the executable with symbolic links resolved
format!("{}.msgpack", digest(&uv_fs::absolutize_path(executable)?)),
// We use the absolute path for the cache entry to avoid cache collisions for relative
// paths. But we don't to query the executable with symbolic links resolved.
format!("{}.msgpack", digest(&absolute)),
);
// We check the timestamp of the canonicalized executable to check if an underlying
// interpreter has been modified
let modified =
Timestamp::from_path(uv_fs::canonicalize_executable(executable).map_err(|err| {
// interpreter has been modified.
let modified = uv_fs::canonicalize_executable(&absolute)
.and_then(Timestamp::from_path)
.map_err(|err| {
if err.kind() == io::ErrorKind::NotFound {
Error::NotFound(executable.to_path_buf())
} else {
err.into()
}
})?)?;
})?;
// Read from the cache.
if cache