summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2017-10-10 17:26:30 +0100
committerArmin Kuster <akuster808@gmail.com>2017-11-09 12:45:39 -0800
commite5c14d5363bb56f949a131d97922c231d545fb4b (patch)
treeb86100688a7d4a9d498cf35f89ae428de0b5fa01
parent8976eb647b08faa912d2c9362b4fd124e169a0b8 (diff)
downloadbitbake-contrib-e5c14d5363bb56f949a131d97922c231d545fb4b.tar.gz
bitbake-contrib-e5c14d5363bb56f949a131d97922c231d545fb4b.tar.bz2
bitbake-contrib-e5c14d5363bb56f949a131d97922c231d545fb4b.zip
bitbake: be more explicit when warning about locale choice
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>
-rwxr-xr-xbin/bitbake2
-rwxr-xr-xbin/bitbake-worker3
2 files changed, 2 insertions, 3 deletions
diff --git a/bin/bitbake b/bin/bitbake
index 558e32d793..3acc23af15 100755
--- a/bin/bitbake
+++ b/bin/bitbake
@@ -36,7 +36,7 @@ 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.\nPython can't change the filesystem locale after loading so we need a utf-8 when python starts or things won't work.")
+ 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.")
__version__ = "1.36.0"
diff --git a/bin/bitbake-worker b/bin/bitbake-worker
index ee2d6224a5..e925054b7f 100755
--- a/bin/bitbake-worker
+++ b/bin/bitbake-worker
@@ -17,7 +17,7 @@ from multiprocessing import Lock
from threading import Thread
if sys.getfilesystemencoding() != "utf-8":
- 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.")
+ 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.")
# Users shouldn't be running this code directly
if len(sys.argv) != 2 or not sys.argv[1].startswith("decafbad"):
@@ -499,4 +499,3 @@ worker_thread.join()
workerlog_write("exitting")
sys.exit(0)
-