[gnome-continuous-yocto/gnomeostree-3.28-rocko: 7151/8267] bitbake: server/process: Ensure we don't loop on client EOFError

[Emmanuele Bassi <ebassi src gnome org>]

commit 801b0d29d435abe55df43da5036b4c8ff7bd59a6
Author: Richard Purdie <richard purdie linuxfoundation org>
Date:   Tue Aug 8 20:55:21 2017 +0100

    bitbake: server/process: Ensure we don't loop on client EOFError
    
    The server currently crashes if we hit an EOFError due to controllersock
    still being in ready and the continue meaning ready isn't re-evaluated.
    Setting the value to False can mean the shutdown code doesn't handle the
    situation cleanly.
    
    Clear ready to avoid the crash/loop instead and handle any OSError whilst
    we're in here.
    
    (Bitbake rev: 2bc47e887c3b41417edaa89a8708c223fd2085de)
    
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 bitbake/lib/bb/server/process.py |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/bitbake/lib/bb/server/process.py b/bitbake/lib/bb/server/process.py
index 338c448..ee8b14e 100644
--- a/bitbake/lib/bb/server/process.py
+++ b/bitbake/lib/bb/server/process.py
@@ -164,7 +164,7 @@ class ProcessServer(multiprocessing.Process):
 
                     self.haveui = True
 
-                except EOFError:
+                except (EOFError, OSError):
                     print("Disconnecting Client")
                     fds.remove(self.controllersock)
                     fds.remove(self.command_channel)
@@ -190,7 +190,7 @@ class ProcessServer(multiprocessing.Process):
                     command = self.command_channel.get()
                 except EOFError:
                     # Client connection shutting down
-                    self.command_channel = False
+                    ready = []
                     continue
                 if command[0] == "terminateServer":
                     self.quit = True