summaryrefslogtreecommitdiffstats
path: root/bitbake/bin/bitbake-worker
diff options
context:
space:
mode:
authorFrank de Brabander <debrabander@gmail.com>2022-12-06 19:18:05 +0100
committerSteve Sakoman <steve@sakoman.com>2023-04-26 04:03:21 -1000
commitee5ff08d87a84f957af29bdf96ef232efdb229ae (patch)
tree48fbf184043fbe74b089ac7ed06def460f8f040e /bitbake/bin/bitbake-worker
parentfa856e0dac16e13991561882bc6ad4c830674d78 (diff)
downloadpoky-ee5ff08d87a84f957af29bdf96ef232efdb229ae.tar.gz
bitbake: 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] (Bitbake rev: 0c6f86b60cfba67c20733516957c0a654eb2b44c) 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 'bitbake/bin/bitbake-worker')
-rwxr-xr-xbitbake/bin/bitbake-worker3
1 files changed, 1 insertions, 2 deletions
diff --git a/bitbake/bin/bitbake-worker b/bitbake/bin/bitbake-worker
index 2f3e9f72f9..5e62bc20de 100755
--- a/bitbake/bin/bitbake-worker
+++ b/bitbake/bin/bitbake-worker
@@ -24,8 +24,7 @@ import subprocess
24from multiprocessing import Lock 24from multiprocessing import Lock
25from threading import Thread 25from threading import Thread
26 26
27if sys.getfilesystemencoding() != "utf-8": 27bb.utils.check_system_locale()
28 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.")
29 28
30# Users shouldn't be running this code directly 29# Users shouldn't be running this code directly
31if len(sys.argv) != 2 or not sys.argv[1].startswith("decafbad"): 30if len(sys.argv) != 2 or not sys.argv[1].startswith("decafbad"):