fix(installer): Fixes the same pkgbase being built multiple times #2534
Conversation
This file contains 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
|
Just noticed this still has test failures locally, will fix those. It appears I broke something related to installing built packages, marking this as a draft until that is fixed. Broken tests as of d2837e1: |
When building a PKGBUILD pkgbase with multiple pkgnames, installAURPackages() invokes buildPkg() multiple times for the same pkgbase. This causes prepare() to be run multiple times for the same pkgbase, since detection of already built packages happens after prepare(). Additionally, detection of already built packages can fail if the split debug packages are enabled and the package does not contain any binaries, causing no -debug package to be created by makepkg even though it is listed by makepkg --packagelist. This commit fixes this by keeping track of the pkgdests built by buildPkg() and avoiding rebuilds of the same pkgbase in the same yay invocation. Fixes Jguer#2340. Signed-off-by: Ferdinand Bachmann <[email protected]>
Ferdi265
force-pushed
the
fix-pkgbase-built-multiple-times
branch
from
d2837e1 to
5064027
Compare
|
Fixed accidently shadowing the Broken tests as of d9e17f9: |
Previously, the buildPkg invocation for a pkgbase only considered whether the current pkgname is part of installer.origTargets. This made the decision whether to rebuild the package order-dependent. This commit fixes this by keeping track of which pkgbases are part of installer.origTargets and rebuilding the pkgbase if any of its pkgnames is part of origTargets.
The previous two commits changed how split packages (packages with the same pkgbase) are built, ensuring that those packages aren't built multiple times. This commit updates the lists of commands that the tests expect to be run so that `makepkg` isn't run multiple times per pkgbase.
Ferdi265
force-pushed
the
fix-pkgbase-built-multiple-times
branch
from
5064027 to
242cc18
Compare
|
Fixed another issue in a26822f: Previously, whether a pkgbase was built was considered part of |
|
👍 let's get some feedback from yay-git |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
When building a PKGBUILD pkgbase with multiple pkgnames,
installAURPackages()invokesbuildPkg()multiple times for the same pkgbase. This causesprepare()to be run multiple times for the same pkgbase, since detection of already built packages happens afterprepare().Additionally, detection of already built packages can fail if the split debug packages are enabled and the package does not contain any binaries, causing no
-debugpackage to be created by makepkg even though it is listed bymakepkg --packagelist.This PR fixes this by keeping track of the pkgdests built by
buildPkg()and avoiding rebuilds of the same pkgbase in the same yay invocation.Fixes #2340.