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

pym/cl_ldap.py

@@ -5652,19 +5652,29 @@ the extension '.env'")%bFile)
         hostName = self.clVars.Get('os_net_hostname')
         domain = self.clVars.Get('os_net_domain')
         services = []
+        # Найден ли в списке серверов репликации текущий сервер
+        flagFoundReplServer = False
         fullHostName = "%s.%s"%(hostName,domain)
         if not fullHostName in replSambaServers:
-            if fullHostName in replUnixServers and\
-               self.replListFileUnix[1:] in archFiles:
-               services = ["unix"]
+            if fullHostName in replUnixServers:
+                flagFoundReplServer = True
+                if self.replListFileUnix[1:] in archFiles:
+                    services = ["unix"]
         else:
+            flagFoundReplServer = True
             if self.replListFileSamba[1:] in archFiles:
                 services = ["unix","samba"]
         # Удаляем временные файлы
         self.removeTmpFiles()
-        if not services:
-            self.printERROR(_("Inside the archive %s no files \
-for running replication")%bFile)
+        if flagFoundReplServer:
+            if not services:
+                self.printERROR(_("Inside the archive %s no files \
+    for running replication")%bFile)
+                return False
+        else:
+            self.printERROR(\
+        _("Not found this replication server %s in backup file")%fullHostName+\
+        " ...")
             return False
         return services