|
|
|
@ -192,7 +192,8 @@ class updateUserConfigs(shareUpdateConfigs):
|
|
|
|
|
|
|
|
|
|
def updateConfig(self, nameProgram, xUsers):
|
|
|
|
|
"""Обновление конфигурационных файлов у пользователей"""
|
|
|
|
|
|
|
|
|
|
self.logger.info(_("Package %s") %nameProgram)
|
|
|
|
|
self.logger.info(_("Update users configuration files"))
|
|
|
|
|
if not os.path.exists(self.firstEnvFile):
|
|
|
|
|
self.printWARNING(_("File '%s' does not exist")%self.firstEnvFile)
|
|
|
|
|
return True
|
|
|
|
@ -205,6 +206,7 @@ class updateUserConfigs(shareUpdateConfigs):
|
|
|
|
|
if sRet:
|
|
|
|
|
sectionsWork.append(sRet.group(1))
|
|
|
|
|
sectName = "desktop"
|
|
|
|
|
dictPakkages = {}
|
|
|
|
|
# Если установлен calculate-desktop
|
|
|
|
|
if sectName in sectionsWork:
|
|
|
|
|
section = ""
|
|
|
|
@ -216,7 +218,6 @@ class updateUserConfigs(shareUpdateConfigs):
|
|
|
|
|
flagSkipDesktop=False):
|
|
|
|
|
section = sectName
|
|
|
|
|
break
|
|
|
|
|
dictPakkages = {}
|
|
|
|
|
if section:
|
|
|
|
|
for userName in xUsers:
|
|
|
|
|
clVars = DataVarsObject(section)
|
|
|
|
@ -240,7 +241,6 @@ class updateUserConfigs(shareUpdateConfigs):
|
|
|
|
|
dictPakkages[nameAndVerPkg].append((userName,
|
|
|
|
|
sorted(list(set(dirsFiles[1])))))
|
|
|
|
|
if dictPakkages:
|
|
|
|
|
self.logger.info(_("Package %s") %nameProgram)
|
|
|
|
|
for calcPkg in dictPakkages:
|
|
|
|
|
self.printWARNING(_("Package %s has changed files")\
|
|
|
|
|
%calcPkg+":")
|
|
|
|
@ -248,6 +248,8 @@ class updateUserConfigs(shareUpdateConfigs):
|
|
|
|
|
self.printWARNING(" "*2 + _("User %s")%userName + ":")
|
|
|
|
|
for nameConfigFile in configFiles:
|
|
|
|
|
self.printWARNING(" "*5 + nameConfigFile)
|
|
|
|
|
if not dictPakkages:
|
|
|
|
|
self.logger.warn(_("Not found templates"))
|
|
|
|
|
return True
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@ -272,6 +274,9 @@ class updateSystemConfigs(shareUpdateConfigs):
|
|
|
|
|
return True
|
|
|
|
|
|
|
|
|
|
def updateConfig(self, nameProgram, configPath):
|
|
|
|
|
"""Обновление системных конфигурационных файлов"""
|
|
|
|
|
self.logger.info(_("Package %s") %nameProgram)
|
|
|
|
|
self.logger.info(_("Update system cofiguration files"))
|
|
|
|
|
if not os.path.exists(configPath):
|
|
|
|
|
self.printERROR(_("Path '%s' does not exist")%configPath)
|
|
|
|
|
return False
|
|
|
|
@ -314,7 +319,6 @@ class updateSystemConfigs(shareUpdateConfigs):
|
|
|
|
|
dictPakkages[nameAndVerPkg] =\
|
|
|
|
|
sorted(list(set(dirsFiles[1])))
|
|
|
|
|
if dictPakkages:
|
|
|
|
|
self.logger.info(_("Package %s") %nameProgram)
|
|
|
|
|
for calcPkg in dictPakkages:
|
|
|
|
|
self.printWARNING(_("Package %s has changed files")%calcPkg+":")
|
|
|
|
|
for nameF in dictPakkages[calcPkg]:
|
|
|
|
@ -322,4 +326,6 @@ class updateSystemConfigs(shareUpdateConfigs):
|
|
|
|
|
if nameFile[:1] != "/":
|
|
|
|
|
nameFile = "/" + nameFile
|
|
|
|
|
self.printWARNING(" "*5 + nameFile)
|
|
|
|
|
else:
|
|
|
|
|
self.logger.warn(_("Not found templates"))
|
|
|
|
|
return True
|
|
|
|
|