From acf1c9ec92a2893e0141594485dfd7d638089d50 Mon Sep 17 00:00:00 2001
From: Mike Hiretsky <mh@calculate.ru>
Date: Wed, 2 Jun 2010 15:09:42 +0400
Subject: [PATCH 1/2] Fix executing rsync

---
 pym/cl_client.py | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/pym/cl_client.py b/pym/cl_client.py
index e0e1dda..a3fab19 100644
--- a/pym/cl_client.py
+++ b/pym/cl_client.py
@@ -151,12 +151,6 @@ class RsyncProgressBar:
             s = self.pipe.stdout.readline()
             if len(s) == 0:
                 break
-            q = self.senderre.search(s)
-            if q:
-                maximum = int(q.groups()[0])
-                if self.maximum < maximum:
-                    self.maximum = maximum
-                continue
             q = self.receiverre.search(s)
             if q:
                 if not self.copyStarting:
@@ -481,7 +475,7 @@ class client(share):
 --filter="P /.Xauthority" \
 --filter="P /.thumbnails" \
 --filter="P /.mozilla/firefox/*/Cache" \
---filter="P /FTP" -a -x -v -v -v -v  %s/ %s/' %(homeTemplate,userHome)
+--filter="P /FTP" -a -x -v -v -v  %s/ %s/' %(homeTemplate,userHome)
         elif sync == "logout":
             if os.path.exists(userHome) and os.listdir(userHome) and\
                 os.path.exists(homeTemplate):
@@ -496,7 +490,7 @@ class client(share):
 --exclude="/.kde4/socket-*" --exclude="/.kde4/share/config/phonondevicesrc" \
 --exclude="/.thumbnails" \
 --exclude="/.mozilla/firefox/*/Cache" \
--a -x -v -v -v -v %s/ %s/'%(userHome,homeTemplate)
+-a -x -v -v -v %s/ %s/'%(userHome,homeTemplate)
         else:
             self.printERROR(_("Method syncUser: option sync=%s incorrect")\
             %str(sync))
@@ -526,11 +520,11 @@ class client(share):
                     if numfiles is False:
                         if os.path.exists(configFileName):
                             os.remove(configFileName)
-                        numfiles = 1
+                        numfiles = 0
                     else:
                         numfiles = int(numfiles)
                 except:
-                    numfiles = 1
+                    numfiles = 0
                 rsync.maximum = numfiles
                 if progress:
                     rsync.run()

From ef23cfb2360d708b6cd39b52aa0dc80cabb81fb1 Mon Sep 17 00:00:00 2001
From: Mike Hiretsky <mh@calculate.ru>
Date: Wed, 2 Jun 2010 15:36:43 +0400
Subject: [PATCH 2/2] Fix kdmrc

---
 client/system/undomain/usr/share/config/kdm/kdmrc | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/client/system/undomain/usr/share/config/kdm/kdmrc b/client/system/undomain/usr/share/config/kdm/kdmrc
index 8e832a5..caaeff8 100644
--- a/client/system/undomain/usr/share/config/kdm/kdmrc
+++ b/client/system/undomain/usr/share/config/kdm/kdmrc
@@ -1,12 +1,3 @@
-# Calculate format=kde exists(/usr/share/config/kdm/kdmrc)==1
-[X-*-Core]
-Reset=/usr/share/config/kdm/Xreset
-Startup=/usr/share/config/kdm/Xstartup
-#?cl_remote_host!=#
-[X-*-Greeter]
-MinShowUID=1000
-#cl_remote_host#
-#?cl_remote_host==#
+# Calculate format=kde pkg(kde-base/kdm)!=
 [X-*-Greeter]
 MinShowUID=999
-#cl_remote_host#