core: Compare rpm file coloring within layered packages #3161
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
Prep for specializing the `TR_ADDED` branch further.
Hmm, not sure what's going on there. Digging. |
This converts `files_added` from a `map{path -> color}` to a
`map{nevra -> map{path -> color}` and similarly for `files_skip_add`.
Prep for next patch which makes use of that extra information.
d0f75c0 to
efaa0bc
Compare
lucab
previously approved these changes
Oct 7, 2021
cgwalters
previously approved these changes
Oct 7, 2021
Before, we were only comparing rpm file coloring between layered packages and base packages. But we also need to compare layered packages among themselves. A concrete example is `unixODBC` which isn't in e.g. Fedora Silverblue, but which some packages pull in both the i686 and x86_64 versions. In that case, we need to skip the checkout of files in the i686 version which are also in the x86_64 one. Closes: coreos#1937
This matches the pattern we use for `files_skip_delete` and makes it clear it won't be used later.
We only ever need to handle RPM file colors on architectures that have them. And even on those that do, we only need to decide between differently colored RPM files, and not e.g. documentation files. So we can skip adding those to the map of files added.
efaa0bc to
19ccb7d
Compare
|
Updated for comments! |
|
@cgwalters This fixes an install blocker for some Fedora packages (most noticably lutris (described in #1937)). Can this PR be included in a dot release of 2021.12? EDIT: I'm a bit very confused. Just gave the old reproducer a try and the issue was no longer reproduciable (already with 2021.11). I have a guess why: May this issue only show up if EDIT2: Issue #1937 appears on any update afterwards. Do not remember if this was originally the case. I'll wait for !3161 to land and test again. |
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.
Before, we were only comparing rpm file coloring between layered
packages and base packages. But we also need to compare layered packages
among themselves. A concrete example is
unixODBCwhich isn't in e.g.Fedora Silverblue, but which some packages pull in both the i686 and
x86_64 versions. In that case, we need to skip the checkout of files in
the i686 version which are also in the x86_64 one.
Closes: #1937