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

Always decode manifests with utf-8; not just most of the time #711

Merged
merged 3 commits into from
Jun 26, 2024

Conversation

marc-hb
Copy link
Collaborator

@marc-hb marc-hb commented May 28, 2024

3 commits.

  • Two de-duplication commits with no effect
  • Consistently decode manifests with utf-8

This is a "larger" alternative to #710

Cosmetic fix, no functional change. A little less duplication and
hardcoding.

listdir_at() had an optional "encoding" parameter but it was never used
before now, always defaulting to 'utf-8'.

Signed-off-by: Marc Herbert <marc.herbert@intel.com>
No functional change: just a lot less duplication & hardcoding.

This can help testing and supporting other encodings. It does not hurt
in any case.

Signed-off-by: Marc Herbert <marc.herbert@intel.com>
@marc-hb

This comment was marked as outdated.

@marc-hb marc-hb marked this pull request as ready for review May 28, 2024 19:33
@marc-hb marc-hb marked this pull request as draft May 28, 2024 19:34
@marc-hb
Copy link
Collaborator Author

marc-hb commented May 28, 2024

This is a "larger" alternative to #710

@ylz0923 can you please fetch and test this?

@ylz0923
Copy link

ylz0923 commented May 31, 2024

It test success in the case(project.py: Specify the manifest file to use UTF-8 encoding #710).

@marc-hb marc-hb marked this pull request as ready for review May 31, 2024 14:44
@mbolivar

This comment was marked as resolved.

@marc-hb

This comment was marked as outdated.

Fixes issue reported in PR zephyrproject-rtos#710 where most places are hardcoded to
'utf-8' while this one is (Windows) locale-dependent. In the future, we
may want to make this more flexible but the most urgent fix is
consistency: with this commit, manifest decoding should be hardcoded to
'utf-8' everywhere.

Signed-off-by: Marc Herbert <marc.herbert@intel.com>
@marc-hb marc-hb added the bug Something isn't working label Jun 19, 2024
@marc-hb marc-hb merged commit 155b242 into zephyrproject-rtos:main Jun 26, 2024
9 checks passed
@marc-hb marc-hb deleted the manifest-utf8 branch June 26, 2024 17:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants