actions/cargo-binstall
1
0
Fork 0
mirror of https://github.com/cargo-bins/cargo-binstall.git synced 2025-06-16 07:36:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix order of override: cli options alwayus takes precedence

Browse source 
Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
This commit is contained in:
Jiahao XU 2024-07-23 23:37:56 +10:00
parent a34f86f989
commit 3f99d23010
No known key found for this signature in database
GPG key ID: 76D1E687CA3C4928
1 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
crates/binstalk/src/ops/resolve.rs
View file

@ -88,10 +88,6 @@ async fn resolve_inner(
return Ok(Resolution::AlreadyUpToDate); return Ok(Resolution::AlreadyUpToDate);
}; };
let meta = package_info
.meta
.merge_overrides(iter::once(&opts.cli_overrides));
let desired_targets = opts let desired_targets = opts
.desired_targets .desired_targets
.get() .get()
@ -100,7 +96,9 @@ async fn resolve_inner(
.map(|target| { .map(|target| {
debug!("Building metadata for target: {target}"); debug!("Building metadata for target: {target}");
let meta = meta.merge_overrides(package_info.overrides.get(target)); let meta = package_info.meta.merge_overrides(
iter::once(&opts.cli_overrides).chain(package_info.overrides.get(target)),
);
debug!("Found metadata: {meta:?}"); debug!("Found metadata: {meta:?}");
@ -246,6 +244,10 @@ async fn resolve_inner(
return Err(BinstallError::NoFallbackToCargoInstall); return Err(BinstallError::NoFallbackToCargoInstall);
} }
let meta = package_info
.meta
.merge_overrides(iter::once(&opts.cli_overrides));
let target_meta = desired_targets let target_meta = desired_targets
.first() .first()
.map(|target_data| &target_data.meta) .map(|target_data| &target_data.meta)