From 570c75b02f2ed72f43e1cb5246f497165fe2aff6 Mon Sep 17 00:00:00 2001 From: Stefan Huber Date: Tue, 15 May 2012 12:06:22 +0200 Subject: [PATCH] tarp's output: clean up code --- shbackup | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/shbackup b/shbackup index 977fb5c..a45305e 100755 --- a/shbackup +++ b/shbackup @@ -286,28 +286,14 @@ class BackupManager: fl = fcntl.fcntl(fd, fcntl.F_GETFL) fcntl.fcntl(fd, fcntl.F_SETFL, fl | os.O_NONBLOCK) - def readlineNonBlocking(stream): - """Read a line nonblocking. Returns b'' if nothing read.""" - try: - return stream.readline() - except: - return b'' - pass - - # Read stdout and stderr of tarp errmsg = b"" while tarp.poll() == None: rd,wr,ex = select.select([tarp.stdout, tarp.stderr], [], [], 0.05) - if tarp.stdout in rd: - l = readlineNonBlocking(tarp.stdout) - if l != b"": - logging.debug(l[:-1].decode()) - + logging.debug( tarp.stdout.readline()[:-1].decode() ) if tarp.stderr in rd: - errmsg += readlineNonBlocking(tarp.stderr) - + errmsg += tarp.stderr.read() # Get the remainging output of tarp for l in tarp.stdout.readlines(): -- 2.39.5