diff --git a/calculate/lib/cl_template.py b/calculate/lib/cl_template.py index 59a2106..08f796f 100644 --- a/calculate/lib/cl_template.py +++ b/calculate/lib/cl_template.py @@ -2802,6 +2802,8 @@ class templateFunction(_error, _warning, _shareTemplate, _shareTermsFunction): def funcPkgw(self, funArgv, resS, localVars, textTemplateTmp, nameTemp): """Функция шаблона pkgw(), возвращает аргумент если программа установлена""" # Название программы + import time + t = time.time() nameProg = funArgv.replace(" ","") origProg = nameProg # Замена функции в тексте шаблона @@ -2811,6 +2813,7 @@ class templateFunction(_error, _warning, _shareTemplate, _shareTermsFunction): nameProg, spl, slot = nameProg.partition(":") if not category in self.installCategory: self.getInstallPkgGentoo(category=category) + self.installCategory.append(category) replace = self.pkg(nameProg, slot=slot or None) else: if not self.flagAllPkgScan: @@ -2823,6 +2826,7 @@ class templateFunction(_error, _warning, _shareTemplate, _shareTermsFunction): replace = origProg textTemplateTmp = textTemplateTmp[:resS.start()] + replace +\ textTemplateTmp[resS.end():] + print "TIME",time.time() -t return textTemplateTmp def funcPkg(self, funArgv, resS, localVars, textTemplateTmp, nameTemp): @@ -2836,6 +2840,7 @@ class templateFunction(_error, _warning, _shareTemplate, _shareTermsFunction): nameProg, spl, slot = nameProg.partition(":") if not category in self.installCategory: self.getInstallPkgGentoo(category=category) + self.installCategory.append(category) replace = self.pkg(nameProg, slot=slot or None) else: if not self.flagAllPkgScan: