diff options
author | Benjamin Esquivel <benjamin.esquivel@linux.intel.com> | 2016-10-07 16:46:26 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-10-08 07:46:16 +0100 |
commit | 35927a98daeeb854ef5782e900206af6cd96b3d7 (patch) | |
tree | 232ca5f02d62079eaedb59ff4d781b7d09783f98 | |
parent | 1bf2ef874fbe47f1320007efa0bdeef8d630b8a1 (diff) | |
download | bitbake-contrib-35927a98daeeb854ef5782e900206af6cd96b3d7.tar.gz |
main: Check bitbake server-only port is a number
Either using the memres script or the bitbake call with --server-only
if the port is a string instead of a number then the process hangs
indefinitely causing a loop that never ends.
Add a check at the beginning for the port being a number otherwise
show an error message and exit cleanly.
[YOCTO #10397]
Signed-off-by: Benjamin Esquivel <benjamin.esquivel@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rwxr-xr-x | lib/bb/main.py | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/lib/bb/main.py b/lib/bb/main.py index 7f7d87bd0..f2f59f670 100755 --- a/lib/bb/main.py +++ b/lib/bb/main.py @@ -402,6 +402,13 @@ def bitbake_main(configParams, configuration): if not configParams.bind: raise BBMainException("FATAL: The '--server-only' option requires a name/address " "to bind to with the -B option.\n") + else: + try: + #Checking that the port is a number + int(configParams.bind.split(":")[1]) + except (ValueError,IndexError): + raise BBMainException( + "FATAL: Malformed host:port bind parameter") if configParams.remote_server: raise BBMainException("FATAL: The '--server-only' option conflicts with %s.\n" % ("the BBSERVER environment variable" if "BBSERVER" in os.environ \ |