[gnome-continuous-yocto/gnomeostree-3.28-rocko: 2924/8267] oeqa/sshcontrol: Handle interrupted system call error

[Emmanuele Bassi <ebassi src gnome org>]

commit 78c01995e34b8e044913c4ab8646932c00fd6560
Author: Richard Purdie <richard purdie linuxfoundation org>
Date:   Mon Oct 3 15:56:13 2016 +0100

    oeqa/sshcontrol: Handle interrupted system call error
    
    Deal with an interrupted system call gracefully:
    
    |   File 
"/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-qa-systemd/build/meta/lib/oeqa/utils/sshcontrol.py", 
line 55, in _run
    |     if select.select([self.process.stdout], [], [], 5)[0] != []:
    | InterruptedError: [Errno 4] Interrupted system call
    
    (From OE-Core rev: 556125e4004fb7ac5169b59f51dc151f18c1806a)
    
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/lib/oeqa/utils/sshcontrol.py |   24 +++++++++++++-----------
 1 files changed, 13 insertions(+), 11 deletions(-)
---
diff --git a/meta/lib/oeqa/utils/sshcontrol.py b/meta/lib/oeqa/utils/sshcontrol.py
index da485ee..05d6502 100644
--- a/meta/lib/oeqa/utils/sshcontrol.py
+++ b/meta/lib/oeqa/utils/sshcontrol.py
@@ -52,17 +52,19 @@ class SSHProcess(object):
             endtime = self.starttime + timeout
             eof = False
             while time.time() < endtime and not eof:
-                if select.select([self.process.stdout], [], [], 5)[0] != []:
-                    data = os.read(self.process.stdout.fileno(), 1024)
-                    if not data:
-                        self.process.stdout.close()
-                        eof = True
-                    else:
-                        data = data.decode("utf-8")
-                        output += data
-                        self.log(data)
-                        endtime = time.time() + timeout
-
+                try:
+                    if select.select([self.process.stdout], [], [], 5)[0] != []:
+                        data = os.read(self.process.stdout.fileno(), 1024)
+                        if not data:
+                            self.process.stdout.close()
+                            eof = True
+                        else:
+                            data = data.decode("utf-8")
+                            output += data
+                            self.log(data)
+                            endtime = time.time() + timeout
+                except InterruptedError:
+                    continue
 
             # process hasn't returned yet
             if not eof: