From 69a3b550f78d65104795cc93b051554e6860b900 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A1=D0=B0=D0=BC=D0=BE=D1=83=D0=BA=D0=B8=D0=BD=20=D0=90?= =?UTF-8?q?=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Tue, 7 Sep 2010 09:07:55 +0400 Subject: [PATCH] Fix output from update configuration files. --- pym/update_config/cl_update_config.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pym/update_config/cl_update_config.py b/pym/update_config/cl_update_config.py index 0c8c44d..e5754e0 100644 --- a/pym/update_config/cl_update_config.py +++ b/pym/update_config/cl_update_config.py @@ -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]