- #print("tarargs: ", tarargs)
- print("tar call: " + " ".join(tarargs), file=log)
- tarp = subprocess.Popen( tarargs, stderr=subprocess.PIPE )
-
+ logfile.debug("tar call: " + " ".join(tarargs))
+ tarp = subprocess.Popen( tarargs, bufsize=-1, \
+ stdout=subprocess.PIPE, stderr=subprocess.PIPE )
+
+ # Change tarp's stdout and stderr to non-blocking
+ for s in [tarp.stdout, tarp.stderr]:
+ fd = s.fileno()
+ 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:
+ l = readlineNonBlocking(tarp.stdout)
+ if l != b"":
+ logging.debug(l[:-1].decode())
+ errmsg += readlineNonBlocking(tarp.stderr)
+
+
+ # Get the remainging output of tarp
+ for l in tarp.stdout.readlines():
+ logging.debug(l.decode().rstrip())
+ errmsg += tarp.stderr.read()
+
+ # Get return code of tarp