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

Make uv cache prune robust to unreadable rkyv entries (#7561)

Browse source 
## Summary

We're robust to these in the rest of the CLI, but not in `uv cache
prune`.
This commit is contained in:
Charlie Marsh 2024-09-19 16:48:20 -04:00 • committed by GitHub
parent b8f9ee3b4d
commit f9b882939f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 2 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
crates/uv-distribution/src/source/mod.rs
View file

@ -1806,8 +1806,7 @@ pub fn prune(cache: &Cache) -> Result<Removal, Error> {
// directories. // directories.
let revision = entry.path().join("revision.http"); let revision = entry.path().join("revision.http");
if revision.is_file() { if revision.is_file() {
let pointer = HttpRevisionPointer::read_from(revision)?; if let Ok(Some(pointer)) = HttpRevisionPointer::read_from(revision) {
if let Some(pointer) = pointer {
// Remove all sibling directories that are not referenced by the pointer. // Remove all sibling directories that are not referenced by the pointer.
for sibling in entry.path().read_dir().map_err(Error::CacheRead)? { for sibling in entry.path().read_dir().map_err(Error::CacheRead)? {
let sibling = sibling.map_err(Error::CacheRead)?; let sibling = sibling.map_err(Error::CacheRead)?;
@ -1832,8 +1831,7 @@ pub fn prune(cache: &Cache) -> Result<Removal, Error> {
// directories. // directories.
let revision = entry.path().join("revision.rev"); let revision = entry.path().join("revision.rev");
if revision.is_file() { if revision.is_file() {
let pointer = LocalRevisionPointer::read_from(revision)?; if let Ok(Some(pointer)) = LocalRevisionPointer::read_from(revision) {
if let Some(pointer) = pointer {
// Remove all sibling directories that are not referenced by the pointer. // Remove all sibling directories that are not referenced by the pointer.
for sibling in entry.path().read_dir().map_err(Error::CacheRead)? { for sibling in entry.path().read_dir().map_err(Error::CacheRead)? {
let sibling = sibling.map_err(Error::CacheRead)?; let sibling = sibling.map_err(Error::CacheRead)?;