Fix: OptionStringContainer::to_string delimiter and implement escaping
#2502
Conversation
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
m-blaha
reviewed
Nov 5, 2025
m-blaha
requested changes
Nov 6, 2025
libdnf5/conf/option_string_list.cpp
Outdated
| } | ||
| oss << val; | ||
| for (const auto ch : item) { | ||
| if (delimiters.find(ch) != delimiters.npos) { |
Member
There was a problem hiding this comment.
The backslash itself should also be escaped. Currently both ["first,second"] and ["first","second"] are serialized as the same string "first\,second".
Contributor
Author
There was a problem hiding this comment.
Thanks. The backslash character is now properly escaped.
I also updated the method docstring and modified unit tests to cover backslash escaping.
The methods to_string() and get_value_string() in OptionStringContainer were incorrectly using the hardcoded delimiter ", ". This commit fixes two issues: 1. Delimiter Usage - The methods now use the first defined delimiter instead of the hardcoded ", ". 2. Escaping - Delimiters that are part of the value are now escaped with a backslash '\'.
The primary tests call get_value_string, which provides implicit coverage for the internally called to_string method.
jrohel
force-pushed
the
fix_OpitonStringContainer_to_string_delim_and_escape
branch
from
3f36c89 to
be65300
Compare
Merged
via the queue into
rpm-software-management:main
with commit Nov 6, 2025
96d10de
19 checks passed
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.
The methods
to_stringandget_value_stringinOptionStringContainerwere incorrectly using the hardcoded delimiter", ".This commit fixes two issues:
Delimiter Usage - The methods now use the first defined delimiter instead of the hardcoded
", ".Escaping - Delimiters that are part of the value are now escaped with a backslash
'\'.Unit tests are included.
Closes: #2500
Closes: #2501