diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-05-11 23:00:15 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-05-13 13:41:32 +0100 |
| commit | a0db1211caf364ec69502b82e583e074431d642a (patch) | |
| tree | 66c9d8291a129d815b227c496c6ba8e7194fb111 | |
| parent | 221705a03bb51448c325c1284bb40c4614ada06a (diff) | |
| download | poky-a0db1211caf364ec69502b82e583e074431d642a.tar.gz | |
bitbake: utils: Force bitbake to en_US.UTF-8 locale setting everywhere
Under python 3, if we spawn python processes, we need to have a UTF-8
locale, else python's file access methods will use ascii. You can't
change that mode once the interpreter is started so we have to ensure
a locale is set. Ideally we'd use C.UTF-8 since OE already forces the
C locale but not all distros support that and we need to set something.
Was tempted to choose en_GB so colour gets spelt correctly :).
This is in some ways pretty nasty, forcing it into the environment
everywhere however we only have a limited number of ways of making
everything work correctly and this beats having to add utf-8 encoding
to every file access command.
A similar change will be needed to bitbake.conf in OE.
(Bitbake rev: 8902c29638411d312e6fc4a197707e5742652e15)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | bitbake/lib/bb/utils.py | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/bitbake/lib/bb/utils.py b/bitbake/lib/bb/utils.py index 0c553dd765..588c192c08 100644 --- a/bitbake/lib/bb/utils.py +++ b/bitbake/lib/bb/utils.py | |||
| @@ -568,6 +568,7 @@ def preserved_envvars_exported(): | |||
| 568 | 'SHELL', | 568 | 'SHELL', |
| 569 | 'TERM', | 569 | 'TERM', |
| 570 | 'USER', | 570 | 'USER', |
| 571 | 'LC_ALL', | ||
| 571 | ] | 572 | ] |
| 572 | 573 | ||
| 573 | def preserved_envvars(): | 574 | def preserved_envvars(): |
| @@ -595,6 +596,12 @@ def filter_environment(good_vars): | |||
| 595 | os.unsetenv(key) | 596 | os.unsetenv(key) |
| 596 | del os.environ[key] | 597 | del os.environ[key] |
| 597 | 598 | ||
| 599 | # If we spawn a python process, we need to have a UTF-8 locale, else python's file | ||
| 600 | # access methods will use ascii. You can't change that mode once the interpreter is | ||
| 601 | # started so we have to ensure a locale is set. Ideally we'd use C.UTF-8 but not all | ||
| 602 | # distros support that and we need to set something. | ||
| 603 | os.environ["LC_ALL"] = "en_US.UTF-8" | ||
| 604 | |||
| 598 | if removed_vars: | 605 | if removed_vars: |
| 599 | logger.debug(1, "Removed the following variables from the environment: %s", ", ".join(removed_vars.keys())) | 606 | logger.debug(1, "Removed the following variables from the environment: %s", ", ".join(removed_vars.keys())) |
| 600 | 607 | ||
