[gnome-continuous-yocto/gnomeostree-3.28-rocko: 8247/8267] bitbake: bitbake: be more explicit when warning about locale choice

[Emmanuele Bassi <ebassi src gnome org>]

commit a5e95c2a85ef142bc523e813cba09bdc165fc0a8
Author: Ross Burton <ross burton intel com>
Date:   Tue Oct 10 17:26:30 2017 +0100

    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>

 bitbake/bin/bitbake        |    2 +-
 bitbake/bin/bitbake-worker |    3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)
---
diff --git a/bitbake/bin/bitbake b/bitbake/bin/bitbake
index 558e32d..3acc23a 100755
--- a/bitbake/bin/bitbake
+++ b/bitbake/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/bitbake/bin/bitbake-worker b/bitbake/bin/bitbake-worker
index ee2d622..e925054 100755
--- a/bitbake/bin/bitbake-worker
+++ b/bitbake/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)
-