- tarargs = [tarpath] + taropts + ["-f", fsfn] + fileset.dirs
- #print("tarargs: ", tarargs)
- tarp = subprocess.Popen( tarargs )
+ # Adding directories to backup
+ taropts += ["-C", "/"] + [ "./" + d.lstrip("/") for d in fileset.dirs]
+
+ # Launch the tar process
+ tarargs = [tarpath] + ["-cpvaf", fsfn] + taropts
+ 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:
+ 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())
+
+ if tarp.stderr in rd:
+ errmsg += readlineNonBlocking(tarp.stderr)