Fix pkg function

develop
Mike Hiretsky 12 years ago
parent c95e833dea
commit d4b9968ecc

@ -2782,20 +2782,18 @@ class templateFunction(_error, _shareTemplate, _shareTermsFunction):
if os.path.exists(pathCategory):
pkgs = os.listdir(pathCategory)
pkgs = map(lambda x: os.path.join(category,x),
pkgs)
pkgs)
installProg = self.sharePkg(pkgs)
replace = self.pkg(nameProg, installProg)
oldInstallProg = self.installProg
self.installProg = {}
self.installProg.update(installProg)
self.installProg.update(oldInstallProg)
self.installProg.update(
filter(lambda x:not x[0] in self.installProg,
installProg.items()))
else:
if not self.flagAllPkgScan:
installProg = self.getInstallPkgGentoo()
oldInstallProg = self.installProg
self.installProg = {}
self.installProg.update(installProg)
self.installProg.update(oldInstallProg)
self.installProg.update(
filter(lambda x:not x[0] in self.installProg,
installProg.items()))
templateFunction.flagAllPkgScan = True
replace = self.pkg(nameProg, self.installProg)
textTemplateTmp = textTemplateTmp[:resS.start()] + replace +\

Loading…
Cancel
Save