Fix RPM package release and version files expansion#816
Merged
aiuto merged 1 commit intobazelbuild:mainfrom Feb 8, 2024
Merged
Fix RPM package release and version files expansion#816aiuto merged 1 commit intobazelbuild:mainfrom
aiuto merged 1 commit intobazelbuild:mainfrom
Conversation
Collaborator
|
@aiuto Do you want to review or can I merge this PR? |
aiuto
approved these changes
Feb 8, 2024
Collaborator
aiuto
left a comment
There was a problem hiding this comment.
Thanks for adding good tests along with this.
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
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.
What
While trying to migrate from version 0.9.1 to 0.10.0 I stumbled across following error:
In #787 a helper function for expanding RPM preamble with user-defined variables was introduced. The function uses Starlark format expression to replace
{var}occurrences with defined variables. However, this does not work when we pass release or version file to the build target. Therpm_pfg.bzlappendsRelease: ${RELEASE_FROM_FILE}andVersion: ${VERSION_FROM_FILE}to preamble, which are later expanded bymake_rpm.pyscript. Thus, those variables are failed to be expanded as they are not defined.Changes
This pull request introduces following changes:
RELEASE_FROM_FILEandVERSION_FROM_FILEby wrapping them in double curly braces. This way${{RELEASE_FROM_FILE}}becomes expanded to${RELEASE_FROM_FILE}, so it can be processed later bymake_rpm.pyversion_fileandrelease_fileattributes