summaryrefslogtreecommitdiffstats
path: root/bitbake/bin
diff options
context:
space:
mode:
authorRoss Burton <ross@burtonini.com>2021-05-03 22:35:53 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-05-04 23:11:04 +0100
commitd583c78d87a16ba7e06da69104da896c79c3a332 (patch)
tree19c69afe5797ca3adfd743ca44ba421a4fda28e2 /bitbake/bin
parent22d26f0759c90d43380eb1025feae8d0ea314959 (diff)
downloadpoky-d583c78d87a16ba7e06da69104da896c79c3a332.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: 95cc877f3bf5ef2513d7af0ae424f78ec7c24f7d) Signed-off-by: Ross Burton <ross.burton@arm.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit c93ae1f861208f6d39fd15c84fbcd0e2b54331f5) Signed-off-by: Anuj Mittal <anuj.mittal@intel.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])