Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix issue: unprintable character is rendered when handling comments in j2 #16287

Merged
merged 1 commit into from
Aug 28, 2023

Conversation

stephenxs
Copy link
Collaborator

@stephenxs stephenxs commented Aug 25, 2023

Use "{#-" and "-#}" to mark comments in jinja template

Why I did it

Work item tracking
  • Microsoft ADO (number only):

How I did it

How to verify it

Which release branch to backport (provide reason below if selected)

  • 201811
  • 201911
  • 202006
  • 202012
  • 202106
  • 202111
  • 202205
  • 202211
  • 202305

Tested branch (Please provide the tested image version)

Description for the changelog

Link to config_db schema for YANG module changes

A picture of a cute animal (not mandatory but encouraged)

…n j2

Use "{#-" and "-#}" to mark comments in jinja template

Signed-off-by: Stephen Sun <[email protected]>
@liat-grozovik
Copy link
Collaborator

@stephenxs to which branches this is needed? master only?

@stephenxs
Copy link
Collaborator Author

@stephenxs to which branches this is needed? master only?

@liat-grozovik The issue was introduced when the license was added as the file header in PR #16096 which has been back-ported to 202211 only so far. So I added a tag for 202211 only (cleanly cherry-picked based on the latest 202211 commit e7ce179)
For 202305 I suppose there should be an independent PR as I see there was a merge conflict on this branch and the change has not been in. @keboliu can you take care of it?

@stephenxs stephenxs marked this pull request as ready for review August 28, 2023 07:40
@stephenxs stephenxs requested a review from lguohan as a code owner August 28, 2023 07:40
@liat-grozovik liat-grozovik merged commit be8843b into sonic-net:master Aug 28, 2023
@stephenxs stephenxs deleted the fix-unprintable branch August 28, 2023 14:43
mssonicbld pushed a commit to mssonicbld/sonic-buildimage that referenced this pull request Sep 3, 2023
…n j2 (sonic-net#16287)

Use "{#-" and "-#}" to mark comments in jinja template

Signed-off-by: Stephen Sun <[email protected]>
@mssonicbld
Copy link
Collaborator

Cherry-pick PR to 202211: #16421

@mssonicbld
Copy link
Collaborator

@stephenxs PR conflicts with 202305 branch

@stephenxs
Copy link
Collaborator Author

@stephenxs PR conflicts with 202305 branch

Thanks @mssonicbld
We do not need to cherry-pick it to 202305 since we have #16298 which includes the fix.
@liat-grozovik FYI
I removed 202305 flag

mssonicbld pushed a commit that referenced this pull request Sep 3, 2023
…n j2 (#16287)

Use "{#-" and "-#}" to mark comments in jinja template

Signed-off-by: Stephen Sun <[email protected]>
sonic-otn pushed a commit to sonic-otn/sonic-buildimage that referenced this pull request Sep 20, 2023
…n j2 (sonic-net#16287)

Use "{#-" and "-#}" to mark comments in jinja template

Signed-off-by: Stephen Sun <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants