Don't expand variables when collecting directives#4871
Open
lukaszachy wants to merge 2 commits into
Open
Conversation
![gemini-code-assist[bot]](https://avatars.githubusercontent.com/in/956858?s=60&v=4){kind=small}
Contributor
There was a problem hiding this comment.
Code Review
This pull request updates the bootc package manager to quote the EOF delimiter in a heredoc, preventing unintended shell expansions. A review comment suggests removing trailing whitespace before newline characters in the ShellScript string to ensure the Containerfile is generated with exact formatting.
Comment on lines
+262
to
+263
| # Quoted delimiter disables any shell expansions | ||
| ShellScript(f'cat <<"EOF" > {containerfile_path!s} \n{containerfile} \nEOF') |
Contributor
There was a problem hiding this comment.
The spaces before \n in the ShellScript string result in trailing whitespace in the generated Containerfile. Remove them to ensure the directives are written exactly as intended.
Suggested change
| # Quoted delimiter disables any shell expansions | |
| ShellScript(f'cat <<"EOF" > {containerfile_path!s} \n{containerfile} \nEOF') | |
| # Quoted delimiter disables any shell expansions | |
| ShellScript(f'cat <<"EOF" > {containerfile_path!s}\n{containerfile}\nEOF') |
References
- Paths that are internally generated and controlled by the application do not need to be quoted in shell commands, as they are not considered user-provided input.
Contributor
Author
There was a problem hiding this comment.
I think it is/will be addresses in #4875
LecrisUT
approved these changes
May 7, 2026
happz
added
ci | full test
3 tasks
The 'finish' doesn't run, but prepare can be tested already
3 tasks
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
3 participants
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.
Fix: #4867
Pull Request Checklist