Fix Jinja whitespace control (#69821)#69822
Open
omolenkamp wants to merge 1 commit into
Open
Conversation
twangboy
requested changes
Jul 17, 2026
twangboy
left a comment
twangboy
left a comment
Contributor
There was a problem hiding this comment.
This looks good, but we'll need a changelog and a test
omolenkamp
force-pushed
the
bugfix/69821-extra-newline-at-end-of-output-with-jinja-template
branch
from
July 17, 2026 20:08
2f15d84 to
dd4e7c7
Compare
Salt sometimes adds unwanted trailing newlines when using Jinja templates. This is caused by the logic added in c123d8f, which isn't entirely correct in all cases. Since Jinja introduced a configuration option `keep_trailing_newline` shortly after that change, which does the same except that it always works, drop the custom code from Salt and simply use the upstream option.
omolenkamp
force-pushed
the
bugfix/69821-extra-newline-at-end-of-output-with-jinja-template
branch
from
July 17, 2026 20:10
dd4e7c7 to
f20f200
Compare
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
2 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.
Salt sometimes adds unwanted trailing newlines when using Jinja templates. This is caused by the logic added in c123d8f, which isn't entirely correct in all cases.
Since Jinja introduced a configuration option
keep_trailing_newlineshortly after that change, which does the same except that it always works, drop the custom code from Salt and simply use the upstream option.