diff options
Diffstat (limited to 'bitbake/bin/bitbake-server')
-rwxr-xr-x | bitbake/bin/bitbake-server | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/bitbake/bin/bitbake-server b/bitbake/bin/bitbake-server index ffbc7894ef..454a3919aa 100755 --- a/bitbake/bin/bitbake-server +++ b/bitbake/bin/bitbake-server | |||
@@ -8,14 +8,16 @@ | |||
8 | import os | 8 | import os |
9 | import sys | 9 | import sys |
10 | import warnings | 10 | import warnings |
11 | warnings.simplefilter("default") | ||
11 | import logging | 12 | import logging |
12 | sys.path.insert(0, os.path.join(os.path.dirname(os.path.dirname(sys.argv[0])), 'lib')) | 13 | sys.path.insert(0, os.path.join(os.path.dirname(os.path.dirname(sys.argv[0])), 'lib')) |
13 | 14 | ||
14 | if sys.getfilesystemencoding() != "utf-8": | 15 | import bb |
15 | 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.") | 16 | |
17 | bb.utils.check_system_locale() | ||
16 | 18 | ||
17 | # Users shouldn't be running this code directly | 19 | # Users shouldn't be running this code directly |
18 | if len(sys.argv) != 10 or not sys.argv[1].startswith("decafbad"): | 20 | if len(sys.argv) != 11 or not sys.argv[1].startswith("decafbad"): |
19 | print("bitbake-server is meant for internal execution by bitbake itself, please don't use it standalone.") | 21 | print("bitbake-server is meant for internal execution by bitbake itself, please don't use it standalone.") |
20 | sys.exit(1) | 22 | sys.exit(1) |
21 | 23 | ||
@@ -26,12 +28,11 @@ readypipeinfd = int(sys.argv[3]) | |||
26 | logfile = sys.argv[4] | 28 | logfile = sys.argv[4] |
27 | lockname = sys.argv[5] | 29 | lockname = sys.argv[5] |
28 | sockname = sys.argv[6] | 30 | sockname = sys.argv[6] |
29 | timeout = sys.argv[7] | 31 | timeout = float(sys.argv[7]) |
30 | xmlrpcinterface = (sys.argv[8], int(sys.argv[9])) | 32 | profile = bool(int(sys.argv[8])) |
33 | xmlrpcinterface = (sys.argv[9], int(sys.argv[10])) | ||
31 | if xmlrpcinterface[0] == "None": | 34 | if xmlrpcinterface[0] == "None": |
32 | xmlrpcinterface = (None, xmlrpcinterface[1]) | 35 | xmlrpcinterface = (None, xmlrpcinterface[1]) |
33 | if timeout == "None": | ||
34 | timeout = None | ||
35 | 36 | ||
36 | # Replace standard fds with our own | 37 | # Replace standard fds with our own |
37 | with open('/dev/null', 'r') as si: | 38 | with open('/dev/null', 'r') as si: |
@@ -50,5 +51,5 @@ logger = logging.getLogger("BitBake") | |||
50 | handler = bb.event.LogHandler() | 51 | handler = bb.event.LogHandler() |
51 | logger.addHandler(handler) | 52 | logger.addHandler(handler) |
52 | 53 | ||
53 | bb.server.process.execServer(lockfd, readypipeinfd, lockname, sockname, timeout, xmlrpcinterface) | 54 | bb.server.process.execServer(lockfd, readypipeinfd, lockname, sockname, timeout, xmlrpcinterface, profile) |
54 | 55 | ||