From dc67023677726006d0548c340cc62876eb972bba Mon Sep 17 00:00:00 2001 From: Zanie Blue Date: Wed, 14 Aug 2024 16:19:30 -0500 Subject: [PATCH] Fix loading of cached metadata for git distributions with subdirectories (#6094) Applies the same fix as https://github.com/astral-sh/uv/issues/5944 to cache loads Closes https://github.com/astral-sh/uv/issues/6093 --- crates/uv-distribution/src/source/mod.rs | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/crates/uv-distribution/src/source/mod.rs b/crates/uv-distribution/src/source/mod.rs index 54f1d4ed875b..a77202bd888a 100644 --- a/crates/uv-distribution/src/source/mod.rs +++ b/crates/uv-distribution/src/source/mod.rs @@ -1226,12 +1226,18 @@ impl<'a, T: BuildContext> SourceDistributionBuilder<'a, T> { .is_fresh() { if let Some(metadata) = read_cached_metadata(&metadata_entry).await? { + let path = if let Some(subdirectory) = resource.subdirectory { + Cow::Owned(fetch.path().join(subdirectory)) + } else { + Cow::Borrowed(fetch.path()) + }; + debug!("Using cached metadata for: {source}"); return Ok(ArchiveMetadata::from( Metadata::from_workspace( metadata, - fetch.path(), - fetch.path(), + &path, + &path, self.build_context.sources(), self.preview_mode, )