summaryrefslogtreecommitdiffstats
path: root/bitbake/bin
diff options
context:
space:
mode:
authorRoss Burton <ross@burtonini.com>2021-04-19 11:07:02 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-04-20 13:57:50 +0100
commit01066a584aa66a07f56cd64434731a650c523d09 (patch)
tree5a571c5e7c330955b2b96b04d5d26c3643524691 /bitbake/bin
parentf39676bf5635af0b7737c5a6ea1195193f63f88f (diff)
downloadpoky-01066a584aa66a07f56cd64434731a650c523d09.tar.gz
bitbake: bitbake-server: ensure server timeout is a float
bitbake-server is spawned by process.py and passes the arguments it is given to ProcessServer. There's some type confusion here: bitbake-server is called with a string representation of the timeout, which may be None. If the timeout is not set, pass 0 instead of None. Inside bitbake-server a ProcessServer is created which expects the timeout to be a float not a string, so always float() the value. [ YOCTO #14350 ] (Bitbake rev: c93ae1f861208f6d39fd15c84fbcd0e2b54331f5) Signed-off-by: Ross Burton <ross.burton@arm.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/bin')
-rwxr-xr-xbitbake/bin/bitbake-server2
1 files changed, 1 insertions, 1 deletions
diff --git a/bitbake/bin/bitbake-server b/bitbake/bin/bitbake-server
index ffbc7894ef..65796be747 100755
--- a/bitbake/bin/bitbake-server
+++ b/bitbake/bin/bitbake-server
@@ -26,7 +26,7 @@ readypipeinfd = int(sys.argv[3])
26logfile = sys.argv[4] 26logfile = sys.argv[4]
27lockname = sys.argv[5] 27lockname = sys.argv[5]
28sockname = sys.argv[6] 28sockname = sys.argv[6]
29timeout = sys.argv[7] 29timeout = float(sys.argv[7])
30xmlrpcinterface = (sys.argv[8], int(sys.argv[9])) 30xmlrpcinterface = (sys.argv[8], int(sys.argv[9]))
31if xmlrpcinterface[0] == "None": 31if xmlrpcinterface[0] == "None":
32 xmlrpcinterface = (None, xmlrpcinterface[1]) 32 xmlrpcinterface = (None, xmlrpcinterface[1])