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# diff --git a/pym/cl_client.py b/pym/cl_client.py index 8ab0582..bcc84e5 100644 --- a/pym/cl_client.py +++ b/pym/cl_client.py @@ -152,12 +152,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: @@ -485,7 +479,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): @@ -500,7 +494,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)) @@ -530,11 +524,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()