summaryrefslogtreecommitdiffstats
path: root/bitbake
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2017-10-10 17:26:30 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-12-04 17:24:01 +0000
commita5e95c2a85ef142bc523e813cba09bdc165fc0a8 (patch)
treef5fa69a7652ebbf154795928def7b3b1e9de27cf /bitbake
parent4b2d0192b271543cea4206ef673614cd6c8ca26a (diff)
downloadpoky-a5e95c2a85ef142bc523e813cba09bdc165fc0a8.tar.gz
bitbake: bitbake: be more explicit when warning about locale choice
(Bitbake rev: b3f7a75aeac31bc0afb7288fc54eb3929a8e1bae) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit 286dce008d6e0bd3121393b28ca02de1385519fb) Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake')
-rwxr-xr-xbitbake/bin/bitbake2
-rwxr-xr-xbitbake/bin/bitbake-worker3
2 files changed, 2 insertions, 3 deletions
diff --git a/bitbake/bin/bitbake b/bitbake/bin/bitbake
index 558e32d793..3acc23af15 100755
--- a/bitbake/bin/bitbake
+++ b/bitbake/bin/bitbake
@@ -36,7 +36,7 @@ from bb import cookerdata
36from bb.main import bitbake_main, BitBakeConfigParameters, BBMainException 36from bb.main import bitbake_main, BitBakeConfigParameters, BBMainException
37 37
38if sys.getfilesystemencoding() != "utf-8": 38if sys.getfilesystemencoding() != "utf-8":
39 sys.exit("Please use a locale setting which supports 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.") 39 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.")
40 40
41__version__ = "1.36.0" 41__version__ = "1.36.0"
42 42
diff --git a/bitbake/bin/bitbake-worker b/bitbake/bin/bitbake-worker
index ee2d6224a5..e925054b7f 100755
--- a/bitbake/bin/bitbake-worker
+++ b/bitbake/bin/bitbake-worker
@@ -17,7 +17,7 @@ from multiprocessing import Lock
17from threading import Thread 17from threading import Thread
18 18
19if sys.getfilesystemencoding() != "utf-8": 19if sys.getfilesystemencoding() != "utf-8":
20 sys.exit("Please use a locale setting which supports 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.") 20 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.")
21 21
22# Users shouldn't be running this code directly 22# Users shouldn't be running this code directly
23if len(sys.argv) != 2 or not sys.argv[1].startswith("decafbad"): 23if len(sys.argv) != 2 or not sys.argv[1].startswith("decafbad"):
@@ -499,4 +499,3 @@ worker_thread.join()
499 499
500workerlog_write("exitting") 500workerlog_write("exitting")
501sys.exit(0) 501sys.exit(0)
502