fix(resolver): split pkgbase merge - #26
Open
pfeifferj wants to merge 3 commits into
Open
Conversation
push_aur_build only merged into the last Base entry. Split-package members resolved non-consecutively ended up in two Bases, causing paru to install them in separate pacman transactions and break version-locked inter-pkg deps. Scan all aur bases on push, merge into any same-pkgbase match. Signed-off-by: Josephine Pfeiffer <hi@josie.lol>
Mirrors the AUR fix: split-pkgbase members from a pkgbuild repo resolved non-consecutively used to land in two Base::Pkgbuild entries (the second with build=false), breaking version-locked inter-pkg deps in the resulting pacman -U transaction. Signed-off-by: Josephine Pfeiffer <hi@josie.lol>
Mirrors the AUR regression test added in 87ba741 for the pkgbuild codepath. Uses two fixture SRCINFOs to trigger non-consecutive resolution: split-dkms depends on split-extra (separate pkgbase), which gets pushed between split-utils and split-dkms and would have caused push_pkgbuild_build to emit a duplicate Base entry before 5db76a0. Signed-off-by: Josephine Pfeiffer <hi@josie.lol>
pfeifferj
force-pushed
the
fix/split-pkgbase-merge
branch
from
May 9, 2026 21:01
3c7cc84 to
d25f59e
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
split-pkgbase pkgs resolved non-consecutively were landing in two
Baseentries where the second one hasbuild=false, so paru puts them into separatepacman -Utransactions and version-pinned inter-pkg deps (e.g.nvidia-580xx-dkms requires nvidia-580xx-utils=580.142) cause issuesthis fix scans all entries and merges into the existing same-pkgbase one instead of pushing a phantom duplicate
fixes Morganamilo/paru#1548, Morganamilo/paru#1173