|
|
|
@ -5587,8 +5587,8 @@ outdated. If the backup is obsolete, use cl-backup."))
|
|
|
|
|
archFiles = map(lambda x: "".join(x.split('\n')),textListFiles)
|
|
|
|
|
flagError = False
|
|
|
|
|
# Находим в списке файлов файлы списки для сервисов
|
|
|
|
|
if not set(archFiles) <= set([self.replListFileSamba,
|
|
|
|
|
self.replListFileUnix]):
|
|
|
|
|
if not set([self.replListFileSamba[1:],
|
|
|
|
|
self.replListFileUnix[1:]]) <= set(archFiles):
|
|
|
|
|
self.printERROR(_("Inside the archive %s no files \
|
|
|
|
|
for running replication")%bFile)
|
|
|
|
|
return False
|
|
|
|
@ -5655,10 +5655,10 @@ the extension '.env'")%bFile)
|
|
|
|
|
fullHostName = "%s.%s"%(hostName,domain)
|
|
|
|
|
if not fullHostName in replSambaServers:
|
|
|
|
|
if fullHostName in replUnixServers and\
|
|
|
|
|
self.replListFileUnix in archFiles:
|
|
|
|
|
self.replListFileUnix[1:] in archFiles:
|
|
|
|
|
services = ["unix"]
|
|
|
|
|
else:
|
|
|
|
|
if self.replListFileSamba in archFiles:
|
|
|
|
|
if self.replListFileSamba[1:] in archFiles:
|
|
|
|
|
services = ["unix","samba"]
|
|
|
|
|
# Удаляем временные файлы
|
|
|
|
|
self.removeTmpFiles()
|
|
|
|
|