Fix locale check when checking for non-printable chars while validating data dirs #4934
Conversation
This file contains 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
|
Your MR should probably be changed to accept both forms. E.g. if you are on OSX, On my Ubuntu 20.04 machine, it returns |
rkjaran
force-pushed
the
fix-validate-data-dir
branch
from
d909b33 to
4e2ec4d
Compare
danpovey
reviewed
Sep 12, 2024
| @@ -126,7 +126,7 @@ fi | |||
| num_utts=`cat $tmpdir/utts | wc -l` | |||
| if ! $no_text; then | |||
| if ! $non_print; then | |||
| if locale -a | grep "C.UTF-8" >/dev/null; then | |||
| if locale -a | grep "C.utf8\|C.UTF-8" >/dev/null; then | |||
There was a problem hiding this comment.
Do we know that locales will accept different spellings?
It would be safer to add another clause to the if-statement to set L=C.utf8 if that's what is available.
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.
As far as I know
locale -areturns results in the formC.utf8,en_US.utf8, etc notC.UTF-8, at least it does on the machines I have access to. This means that the check for non-printable characters invalidate_data_dir.shfails on any system that doesn't have theen-US.UTF-8locale installed.