Ensure binary and source headers are identified as such after parse #3012
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
headerIsSource() uses RPMTAG_SOURCERPM presence to identify binary packages, but that tag gets inserted late in an actual package build, whereas we'd like to source headers to be identifiable right after spec parse already. Non-presence of a tag is not a very strong indicator anyhow, and even less so when said headers are still under construction. Move RPMTAG_SOURCEHEADER insertion early - there's no reason not to - and use its presence as a positive identification of source headers, falling back to the "not a binary" logic when not there to preserve behavior otherwise.
pmatilai
changed the title
Contrary to expectations, there's a perfectly logical place to initialize the source rpm name: initSourceHeader(). This gets called early enough to let use insert RPMTAG_SOURCERPM right after spec parse for proper binary package identification in headerIsSource(). The only special case is buildreqs.nosrc.rpm generation that doesn't follow the normal process, so remember to free the normal name there. Fixes: rpm-software-management#2819
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.
The two commits improve source and binary package header detection right after spec parse, fixing #2819 in the process. Details in commits.