From e2ca45646eed986b9b0a965110b7771cfbc26710 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 31 Aug 2017 17:23:16 +0100 Subject: bitbake: prserv/serv: Gracefully handle the PR server exiting quickly If the server exits quickly its PID may no longer exist. Handle this gracefully. (Bitbake rev: c1b00a9265fa4146b8db8b7d03a51bf2bfcf9f51) Signed-off-by: Richard Purdie --- bitbake/lib/prserv/serv.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'bitbake') diff --git a/bitbake/lib/prserv/serv.py b/bitbake/lib/prserv/serv.py index dfcbd2058f..6a99728c4f 100644 --- a/bitbake/lib/prserv/serv.py +++ b/bitbake/lib/prserv/serv.py @@ -492,7 +492,11 @@ def auto_shutdown(): PRServerConnection(host, port).terminate() except: logger.critical("Stop PRService %s:%d failed" % (host,port)) - os.waitpid(singleton.prserv.pid, 0) + + try: + os.waitpid(singleton.prserv.pid, 0) + except ChildProcessError: + pass singleton = None def ping(host, port): -- cgit v1.2.3-54-g00ecf