From 4bf835a2168d5ec7b47119b3f25a14b04096a1dd Mon Sep 17 00:00:00 2001
From: Mike Khiretskiy <mh@calculate.ru>
Date: Wed, 4 Mar 2015 16:36:57 +0300
Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=20=D0=B2=D1=8B=D0=B2=D0=BE=D0=B4=20rsync=20=D0=BF?=
 =?UTF-8?q?=D1=80=D0=B8=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BA=D0=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pym/client/client.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pym/client/client.py b/pym/client/client.py
index 9af3348..dc69e62 100644
--- a/pym/client/client.py
+++ b/pym/client/client.py
@@ -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: