Quadlet - do not look for line continuation in comment lines #21556
Conversation
Signed-off-by: Ygal Blum <[email protected]>
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: ygalblum The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
openshift-ci
bot
added
the
approved
| for len(data) > 0 && line[len(line)-1] == '\\' { | ||
| line, data = nextLine(origdata, len(line)+1) | ||
| nLines++ | ||
| if !lineIsComment(line) { |
There was a problem hiding this comment.
I don't know much about quadlet, so this may be a stupid question: why is this not:
if lineIsComment(line) {
next iteration
}Is there metadata in comments? Special handling of some sort? It makes me super uncomfortable to see in-loop handling of comments instead of just immediate discard.
There was a problem hiding this comment.
Good point. In its current behavior, Quadlet copies the comments from the input file into the generated .service file. For this reason it handles such lines and does not skip them.
Since I didn't want to change the behavior, I just made it disregard any possible line continuation character in comments
There was a problem hiding this comment.
The passing on of comments is nice, because they will then end up in the generated service file which can sometimes be shown by systemd.
|
/lgtm |
openshift-merge-bot
bot
merged commit 5311233
into
containers:main
stale-locking-app
bot
added
the
locked - please file new issue/PR
Does this PR introduce a user-facing change?
No
Resolves: #21555