]> git-server-git.apps.pok.os.sepia.ceph.com Git - remoto.git/commitdiff
check both out and error for output before quiting
authorAlfredo Deza <alfredo@deza.pe>
Tue, 15 Dec 2015 19:31:28 +0000 (14:31 -0500)
committerAlfredo Deza <alfredo@deza.pe>
Tue, 15 Dec 2015 19:31:28 +0000 (14:31 -0500)
Signed-off-by: Alfredo Deza <alfredo@deza.pe>
remoto/process.py

index 3dc7d5ee4a19adc9c3f3ca02a4ae38bb1fb4e119..47917255c17f19f9248c0a60e19597ee6953dd0c 100644 (file)
@@ -44,21 +44,21 @@ def _remote_run(channel, cmd, **kw):
             while True:
                 for descriptor in reads:
                     if descriptor == process.stdout.fileno():
-                        read = process.stdout.readline()
-                        if read:
-                            channel.send({'debug': read})
+                        out_read = process.stdout.readline()
+                        if out_read:
+                            channel.send({'debug': out_read})
                             sys.stdout.flush()
 
                     if descriptor == process.stderr.fileno():
-                        read = process.stderr.readline()
-                        if read:
-                            channel.send({'warning': read})
+                        err_read = process.stderr.readline()
+                        if err_read:
+                            channel.send({'warning': err_read})
                             sys.stderr.flush()
                 # At this point we have gone through all the possible
                 # descriptors and `read` was empty, so we now can break out of
                 # this since all stdout/stderr has been properly flushed to
                 # logging
-                if not read:
+                if not err_read and not out_read:
                     break
 
             break