|
|
|
@ -78,6 +78,7 @@ class RsyncProgressBar:
|
|
|
|
|
self.rsyncstr = rsyncstr
|
|
|
|
|
self.parent = parent
|
|
|
|
|
self.value = 0
|
|
|
|
|
self.errors = []
|
|
|
|
|
if cmpVersion(rsyncver, "3.1.0") >= 0:
|
|
|
|
|
self.extraopts = " --msgs2stderr"
|
|
|
|
|
self.use_stderr = True
|
|
|
|
@ -105,7 +106,10 @@ class RsyncProgressBar:
|
|
|
|
|
Rsync error message
|
|
|
|
|
"""
|
|
|
|
|
if self.pipe:
|
|
|
|
|
return self.pipe.stderr.read()
|
|
|
|
|
if self.use_stderr:
|
|
|
|
|
return "".join(self.errors)
|
|
|
|
|
else:
|
|
|
|
|
return self.pipe.stderr.read()
|
|
|
|
|
return _("RsyncProgressBar: Wrong pipe")
|
|
|
|
|
|
|
|
|
|
def runsilent(self):
|
|
|
|
@ -146,6 +150,8 @@ class RsyncProgressBar:
|
|
|
|
|
s = self.pipe.stdout.readline()
|
|
|
|
|
if len(s) == 0:
|
|
|
|
|
break
|
|
|
|
|
if s.startswith("rsync:"):
|
|
|
|
|
self.errors.append(s)
|
|
|
|
|
q = self.receiverre.search(s)
|
|
|
|
|
if q:
|
|
|
|
|
if not self.copyStarting:
|
|
|
|
|