diff options
author | Ross Burton <ross.burton@intel.com> | 2017-10-10 17:26:30 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-12-04 17:24:01 +0000 |
commit | a5e95c2a85ef142bc523e813cba09bdc165fc0a8 (patch) | |
tree | f5fa69a7652ebbf154795928def7b3b1e9de27cf /bitbake/bin | |
parent | 4b2d0192b271543cea4206ef673614cd6c8ca26a (diff) | |
download | poky-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/bin')
-rwxr-xr-x | bitbake/bin/bitbake | 2 | ||||
-rwxr-xr-x | bitbake/bin/bitbake-worker | 3 |
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 | |||
36 | from bb.main import bitbake_main, BitBakeConfigParameters, BBMainException | 36 | from bb.main import bitbake_main, BitBakeConfigParameters, BBMainException |
37 | 37 | ||
38 | if sys.getfilesystemencoding() != "utf-8": | 38 | if 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 | |||
17 | from threading import Thread | 17 | from threading import Thread |
18 | 18 | ||
19 | if sys.getfilesystemencoding() != "utf-8": | 19 | if 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 |
23 | if len(sys.argv) != 2 or not sys.argv[1].startswith("decafbad"): | 23 | if len(sys.argv) != 2 or not sys.argv[1].startswith("decafbad"): |
@@ -499,4 +499,3 @@ worker_thread.join() | |||
499 | 499 | ||
500 | workerlog_write("exitting") | 500 | workerlog_write("exitting") |
501 | sys.exit(0) | 501 | sys.exit(0) |
502 | |||