mirrors/uv
1
0
Fork 0
mirror of https://github.com/astral-sh/uv.git synced 2025-07-07 13:25:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Replace all uses of fs_err::tokio::rename with uv_fs::rename_with_retry (#4606)

Browse source 
Same as #4605 but includes persistence of extracted archives and
toolchain downloads.
This commit is contained in:
Zanie Blue 2024-06-28 10:33:23 -04:00 • committed by GitHub
parent f3c7de3c7d
commit 363f3f7862
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -30,7 +30,7 @@ use uv_client::{
};
use uv_configuration::{BuildKind, PreviewMode};
use uv_extract::hash::Hasher;
use uv_fs::{write_atomic, LockedFile};
use uv_fs::{rename_with_retry, write_atomic, LockedFile};
use uv_types::{BuildContext, SourceBuildTrait};
use crate::distribution_database::ManagedClient;
@ -1375,7 +1375,7 @@ impl<'a, T: BuildContext> SourceDistributionBuilder<'a, T> {
fs_err::tokio::create_dir_all(target.parent().expect("Cache entry to have parent"))
.await
.map_err(Error::CacheWrite)?;
fs_err::tokio::rename(extracted, &target)
rename_with_retry(extracted, &target)
.await
.map_err(Error::CacheWrite)?;

4
crates/uv-toolchain/src/downloads.rs
View file

@ -17,7 +17,7 @@ use futures::TryStreamExt;
use tokio_util::compat::FuturesAsyncReadCompatExt;
use tracing::{debug, instrument};
use url::Url;
use uv_fs::Simplified;
use uv_fs::{rename_with_retry, Simplified};
#[derive(Error, Debug)]
pub enum Error {
@ -427,7 +427,7 @@ impl PythonDownload {
// Persist it to the target
debug!("Moving {} to {}", extracted.display(), path.user_display());
fs_err::tokio::rename(extracted, &path)
rename_with_retry(extracted, &path)
.await
.map_err(|err| Error::CopyError {
to: path.clone(),