PRD: Multi-parent extends: for bottles #272

Merged
didericis merged 4 commits from multi-parent-extends into main 2026-06-25 07:39:55 -04:00
Showing only changes of commit 75755a472f - Show all commits
-12
View File
@@ -81,18 +81,6 @@ def _resolve_one_bottle(
f"defined. Available bottles: {avail}" f"defined. Available bottles: {avail}"
) )
if len(parent_names) == 1:
parent_name = parent_names[0]
parent = _resolve_one_bottle(
parent_name, raws, cache, repos_cache, seen + (name,)
)
merged_repos_raw = _resolve_repos_raw(repos_cache[parent_name], child_raw)
bottle = _merge_bottles(parent, child_raw, merged_repos_raw, name)
cache[name] = bottle
repos_cache[name] = merged_repos_raw
return bottle
# Multiple parents: fold left-to-right into a combined parent.
combined_parent, combined_repos_raw = _fold_parents( combined_parent, combined_repos_raw = _fold_parents(
didericis marked this conversation as resolved Outdated
Outdated
Review

Doesn't seem like there's a good reason to have a separate condition for 1 parent... why not just always call "fold_parents"?

Doesn't seem like there's a good reason to have a separate condition for 1 parent... why not just always call "fold_parents"?
parent_names, raws, cache, repos_cache, seen + (name,) parent_names, raws, cache, repos_cache, seen + (name,)
) )