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

Update error message for module conflict hint

Browse source
This commit is contained in:
Zanie Blue 2025-06-06 14:04:32 -05:00
parent 058d97b4c1
commit f836b0c2d3
2 changed files with 7 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

14
crates/uv-install-wheel/src/linker.rs
View file

@ -39,14 +39,12 @@ impl Locks {
(wheel_a, &wheel_b) (wheel_a, &wheel_b)
}; };
warn_user!( warn_user!(
"The module {} exists in two packages! \ "The module `{}` is provided by more than one package, \
This leads to a race condition and likely to a broken installation. \ which causes an install race condition and can result in a broken module. \
Consider removing either {} ({}) or {} ({}).", Consider removing your dependency on either `{}` or `{}`.",
module.simplified_display(), module.simplified_display().green(),
wheel_a.name, wheel_a.name.cyan(),
wheel_a, wheel_b.name.cyan(),
wheel_b.name,
wheel_b,
); );
} }
} }

2
crates/uv/tests/it/pip_install.rs
View file

@ -11409,7 +11409,7 @@ fn overlapping_packages_warning() -> Result<()> {
----- stderr ----- ----- stderr -----
Resolved 2 packages in [TIME] Resolved 2 packages in [TIME]
Prepared 2 packages in [TIME] Prepared 2 packages in [TIME]
warning: The module built_by_uv exists in two packages! This leads to a race condition and likely to a broken installation. Consider removing either built-by-uv (built_by_uv-0.1.0-py3-none-any.whl) or also-built-by-uv (also_built_by_uv-0.1.0-py3-none-any.whl). warning: The module `built_by_uv` is provided by more than one package, which causes an install race condition and can result in a broken module. Consider removing your dependency on either `built-by-uv` or `also-built-by-uv`.
Installed 2 packages in [TIME] Installed 2 packages in [TIME]
+ also-built-by-uv==0.1.0 (from file://[TEMP_DIR]/also_built_by_uv-0.1.0-py3-none-any.whl) + also-built-by-uv==0.1.0 (from file://[TEMP_DIR]/also_built_by_uv-0.1.0-py3-none-any.whl)
+ built-by-uv==0.1.0 (from file://[TEMP_DIR]/built_by_uv-0.1.0-py3-none-any.whl) + built-by-uv==0.1.0 (from file://[TEMP_DIR]/built_by_uv-0.1.0-py3-none-any.whl)