Fix output from update configuration files.

develop
Самоукин Алексей 14 years ago
parent 6df3279e5a
commit 69a3b550f7

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

Loading…
Cancel
Save