CloudNebulaProject/ips
1
0
Fork 0
mirror of https://codeberg.org/Toasterson/ips.git synced 2026-04-10 21:30:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Improve dependency constraint extraction and branch locking logic

Browse source 
- Updated `extract_constraint` to derive constraints from both optional properties and dependency FMRI version strings.
- Ensured child dependencies inherit parent's branch when not explicitly constrained, mirroring solver behavior.
This commit is contained in:
Till Wegmueller 2025-08-26 21:51:05 +02:00
parent d77e61f90f
commit 6ed8bb5b5b
No known key found for this signature in database
1 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
libips/src/solver/advice.rs
View file

@ -121,7 +121,21 @@ fn advise_recursive(
for dep in manifest.dependencies.iter().filter(|d| d.dependency_type == "require" || d.dependency_type == "incorporate") { for dep in manifest.dependencies.iter().filter(|d| d.dependency_type == "require" || d.dependency_type == "incorporate") {
let Some(df) = &dep.fmri else { continue; }; let Some(df) = &dep.fmri else { continue; };
let dep_stem = df.stem().to_string(); let dep_stem = df.stem().to_string();
let (rel, br) = extract_constraint(&dep.optional); // Extract constraints from optional properties and, if absent, from the dependency FMRI version string
let (mut rel, mut br) = extract_constraint(&dep.optional);
let df_ver_str = df.version();
if !df_ver_str.is_empty() {
if rel.is_none() { rel = version_release(&df_ver_str); }
if br.is_none() { br = version_branch(&df_ver_str); }
}
// Mirror solver behavior: lock child to parent's branch when not explicitly constrained
if br.is_none() {
let parent_branch = fmri
.version
.as_ref()
.and_then(|v| v.branch.clone());
if let Some(pb) = parent_branch { br = Some(pb); }
}
if ctx.cap != 0 && processed >= ctx.cap { break; } if ctx.cap != 0 && processed >= ctx.cap { break; }
processed += 1; processed += 1;