CFE-4341: Adjusted package module inventory to include quotes around fields when needed (3.21) #5475
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
…n needed On FreeBSD where package versions can have commas such as joe-4.6,1 this was causing errors with the use of packagesmatching() function. ``` error: Line from package inventory 'joe,4.6,1,amd64,pkg' did not yield correct number of elements. ``` Used CsvWriterField to quote the field in case it includes " , \r \n. See CsvWriterField() at https://github.com/NorthernTechHQ/libntech/blob/master/libutils/csv_writer.c#L73 Had to add a workaround to convert CRLF written by csv_writer to expected LF in resulting inventory_list. Ticket: CFE-4341 Changelog: title Co-authored-by: Lars Erik Wik <lars.erik.wik@northern.tech> (cherry picked from commit 27fdfb5)
|
Thank you for submitting a PR! Maybe @larsewi can review this? |
larsewi
approved these changes
Mar 21, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
On FreeBSD where package versions can have commas such as joe-4.6,1 this was causing errors with the use of packagesmatching() function.
Used CsvWriterField to quote the field in case it includes " , \r \n. See CsvWriterField() at https://github.com/NorthernTechHQ/libntech/blob/master/libutils/csv_writer.c#L73
Had to add a workaround to convert CRLF written by csv_writer to expected LF in resulting inventory_list.
Ticket: CFE-4341
Changelog: title
Co-authored-by: Lars Erik Wik lars.erik.wik@northern.tech
(cherry picked from commit 27fdfb5)