diff options
author | Frank de Brabander <debrabander@gmail.com> | 2022-12-06 19:18:05 +0100 |
---|---|---|
committer | Steve Sakoman <steve@sakoman.com> | 2023-04-13 08:17:57 -1000 |
commit | 0c6f86b60cfba67c20733516957c0a654eb2b44c (patch) | |
tree | 1f0e5e4851c0a8f96f8f71a9e729fc352b65d99b /bin | |
parent | 2802adb572eb73a3eb2725a74a9bbdaafc543fa7 (diff) | |
download | bitbake-contrib-0c6f86b60cfba67c20733516957c0a654eb2b44c.tar.gz |
bin/utils: Ensure locale en_US.UTF-8 is available on the system
Get rid of the duplicate code and add extra check that the
locale en_US.UTF-8 is available on the system. This new helper
method is now located right above the method filter_environment()
which sets LC_ALL environment variable to 'en_US.UTF-8'.
[YOCTO #10165]
Signed-off-by: Frank de Brabander <debrabander@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit a4ce040a6fd540a1cac52f808f909f9fcf8c961c)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Diffstat (limited to 'bin')
-rwxr-xr-x | bin/bitbake | 3 | ||||
-rwxr-xr-x | bin/bitbake-server | 5 | ||||
-rwxr-xr-x | bin/bitbake-worker | 3 |
3 files changed, 5 insertions, 6 deletions
diff --git a/bin/bitbake b/bin/bitbake index 042c91807..0b9cc6297 100755 --- a/bin/bitbake +++ b/bin/bitbake @@ -25,8 +25,7 @@ except RuntimeError as exc: from bb import cookerdata from bb.main import bitbake_main, BitBakeConfigParameters, BBMainException -if sys.getfilesystemencoding() != "utf-8": - sys.exit("Please use a locale setting which supports UTF-8 (such as LANG=en_US.UTF-8).\nPython can't change the filesystem locale after loading so we need a UTF-8 when Python starts or things won't work.") +bb.utils.check_system_locale() __version__ = "2.0.0" diff --git a/bin/bitbake-server b/bin/bitbake-server index f53f88b6b..d00bb068b 100755 --- a/bin/bitbake-server +++ b/bin/bitbake-server @@ -12,8 +12,9 @@ warnings.simplefilter("default") import logging sys.path.insert(0, os.path.join(os.path.dirname(os.path.dirname(sys.argv[0])), 'lib')) -if sys.getfilesystemencoding() != "utf-8": - sys.exit("Please use a locale setting which supports UTF-8 (such as LANG=en_US.UTF-8).\nPython can't change the filesystem locale after loading so we need a UTF-8 when Python starts or things won't work.") +import bb + +bb.utils.check_system_locale() # Users shouldn't be running this code directly if len(sys.argv) != 10 or not sys.argv[1].startswith("decafbad"): diff --git a/bin/bitbake-worker b/bin/bitbake-worker index 2f3e9f72f..5e62bc20d 100755 --- a/bin/bitbake-worker +++ b/bin/bitbake-worker @@ -24,8 +24,7 @@ import subprocess from multiprocessing import Lock from threading import Thread -if sys.getfilesystemencoding() != "utf-8": - sys.exit("Please use a locale setting which supports UTF-8 (such as LANG=en_US.UTF-8).\nPython can't change the filesystem locale after loading so we need a UTF-8 when Python starts or things won't work.") +bb.utils.check_system_locale() # Users shouldn't be running this code directly if len(sys.argv) != 2 or not sys.argv[1].startswith("decafbad"): |