Fix nested config updates across non-option lines#10357
Open
kiwigitops wants to merge 1 commit into
Open
Conversation
Signed-off-by: kiwigitops <kiwisclubco@gmail.com>
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
1 participant
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.
Fixes #10348.
ConfigFileWriter._update_subattributes()assumed every line inside a nested config block matchedOPTION_REGEX, socurrent_indentcould be read before assignment when the block was empty or when a comment/section header followed the parent key.This makes the loop handle section headers before option parsing, skip non-option lines safely, and keep the insertion point at the last line that still belongs to the nested block. The regressions cover empty nested blocks, comments between the parent key and child option, and a next section immediately after the parent key.
Validation:
python -m pytest tests/unit/customizations/configure/test_writer.py -qgit diff --check