|
|
|
@ -160,6 +160,7 @@ class updateUserConfigs(shareUpdateConfigs):
|
|
|
|
|
else:
|
|
|
|
|
mergePrograms = []
|
|
|
|
|
dictPakkages = {}
|
|
|
|
|
listIndex = []
|
|
|
|
|
# Добавление условия, что программа category/nameProgram
|
|
|
|
|
# установлена
|
|
|
|
|
cl_template.templateFunction.installProg.update(\
|
|
|
|
@ -187,11 +188,12 @@ class updateUserConfigs(shareUpdateConfigs):
|
|
|
|
|
nameAndVerPkg = clVars.Get("cl_name")+"-"+\
|
|
|
|
|
clVars.Get("cl_ver")
|
|
|
|
|
if not nameAndVerPkg in dictPakkages:
|
|
|
|
|
listIndex.append(nameAndVerPkg)
|
|
|
|
|
dictPakkages[nameAndVerPkg] = []
|
|
|
|
|
dictPakkages[nameAndVerPkg].append((userName,
|
|
|
|
|
sorted(list(set(dirsFiles[1])))))
|
|
|
|
|
if dictPakkages:
|
|
|
|
|
for calcPkg in dictPakkages:
|
|
|
|
|
for calcPkg in listIndex:
|
|
|
|
|
self.printWARNING(_("Package %s has changed files")\
|
|
|
|
|
%calcPkg+":")
|
|
|
|
|
for userName, configFiles in dictPakkages[calcPkg]:
|
|
|
|
@ -257,6 +259,7 @@ class updateSystemConfigs(shareUpdateConfigs):
|
|
|
|
|
self.printERROR(_("Path '%s' does not exist")%configPath)
|
|
|
|
|
return False
|
|
|
|
|
dictPakkages = {}
|
|
|
|
|
listIndex = []
|
|
|
|
|
# Добавление условия, что программа category/nameProgram установлена
|
|
|
|
|
cl_template.templateFunction.installProg.update(\
|
|
|
|
|
{"%s/%s"%(category,nameProgram):[version],
|
|
|
|
@ -288,10 +291,12 @@ class updateSystemConfigs(shareUpdateConfigs):
|
|
|
|
|
self.printERROR(errMess)
|
|
|
|
|
return False
|
|
|
|
|
if dirsFiles and dirsFiles[1]:
|
|
|
|
|
if not nameAndVerPkg in listIndex:
|
|
|
|
|
listIndex.append(nameAndVerPkg)
|
|
|
|
|
dictPakkages[nameAndVerPkg] =\
|
|
|
|
|
sorted(list(set(dirsFiles[1])))
|
|
|
|
|
if dictPakkages:
|
|
|
|
|
for calcPkg in dictPakkages:
|
|
|
|
|
for calcPkg in listIndex:
|
|
|
|
|
self.printWARNING(_("Package %s has changed files")%calcPkg+":")
|
|
|
|
|
for nameF in dictPakkages[calcPkg]:
|
|
|
|
|
nameFile = nameF.partition(configPath)[2]
|
|
|
|
|