Удаление вывода

git-svn-id: http://svn.calculate.ru/calculate2/calculate-client/trunk@1012 c91db197-33c1-4113-bf15-f8a5c547ca64

pym/cl_client.py

@@ -975,9 +975,9 @@ install/6intranet" %(domain,servDn,unixDN,bindDn,bindPw)
                       mountUidList=['ftp','share']):
         """Монтирует Samba ресурсы"""
         #Экранируем символы
-        print "PWD", userPwd
+        #print "PWD", userPwd
         escUserPwd = re.sub("(\W)", r"\\\1",userPwd)
-        print "escPWD", escUserPwd
+        #print "escPWD", escUserPwd
         if res in mountUidList:
             # Монтируем директории c uid
             mountStr="PASSWD=%s mount -t cifs -o user=%s,uid=%s,gid=%s"\
@@ -990,7 +990,7 @@ install/6intranet" %(domain,servDn,unixDN,bindDn,bindPw)
                                                            userName)+\
                     " //%s/%s %s" %(self.clVars.Get("cl_remote_host"),
                                                 res, path)
-        print mountStr
+        #print mountStr
         textLine = self.execProg(mountStr)
         return textLine
 
@@ -1121,6 +1121,7 @@ install/6intranet" %(domain,servDn,unixDN,bindDn,bindPw)
                     if not self.syncUser(userName, homeDir, "login"):
                         return False
                 # Отмонтируем ресурс
+                time.sleep(0.2)
                 textLine = self.execProg("umount %s"%defaultPath)
                 if not (textLine == None):
                     self.printERROR(_("Can not unmount Samba resource \
@@ -1310,7 +1311,13 @@ resource [%s]")%res + " ...")
                 execStr = '/usr/bin/rsync --delete-excluded --delete \
 --exclude="/.googleearth" --exclude="/.kde4/share/config/phonondevicesrc" \
 --exclude="*~" --exclude="/Home" --exclude="/Disks" --exclude="/FTP" \
+--exclude="/.local/share/akonadi/db_data" --exclude="/.VirtualBox" \
+--exclude="/.mozilla/firefox/calculate.default/urlclassifier3.sqlite" \
+--exclude="/.kde4/share/apps/nepomuk/repository/main/data" \
 --filter="P /.googleearth" --filter="P /Home" --filter="P /Disks" \
+--filter="P /.local/share/akonadi/db_data" --filter="P /.VirtualBox" \
+--filter="P /.mozilla/firefox/calculate.default/urlclassifier3.sqlite" \
+--filter="P /.kde4/share/apps/nepomuk/repository/main/data" \
 --filter="P /FTP" -a -x %s/ %s/' %(homeProfile,userHome)
         elif sync == "logout":
             if os.path.exists(userHome) and os.listdir(userHome) and\
@@ -1318,6 +1325,9 @@ resource [%s]")%res + " ...")
                 execStr = '/usr/bin/rsync --delete-excluded --delete \
 --exclude="/.googleearth" --exclude="/Home" --exclude="/Disks" --exclude="/FTP"\
  --exclude="*~" --exclude="/.kde4/cache-*" --exclude="/.kde4/tmp-*" \
+--exclude="/.local/share/akonadi/db_data" --exclude="/.VirtualBox" \
+--exclude="/.mozilla/firefox/calculate.default/urlclassifier3.sqlite" \
+--exclude="/.kde4/share/apps/nepomuk/repository/main/data" \
 --exclude="/.kde4/socket-*" --exclude="/.kde4/share/config/phonondevicesrc"\
  -a -x %s/ %s/'%(userHome,homeProfile)
         else: