Checking a value of the variable 'cl-name' for updated configurations files.

netsetup
Самоукин Алексей 14 years ago
parent bbcd3bc5ac
commit b29b9fc045

@ -24,6 +24,7 @@ __app__ = cl_install.__app__
from cl_datavars import DataVars
from cl_template import template, templateClt
from cl_print import color_print
import cl_overriding
from cl_lang import lang
lang().setLanguage(sys.modules[__name__])
@ -135,6 +136,7 @@ subdirectories %s")%', '.join(dirsTemplates))
dictPakkages = {}
oldPymPath = ""
listIndex = []
clTempl = False
for sectName in sectionsWork:
realPath = "/usr/lib/calculate-2.2/calculate-%s"%sectName
pymPath = os.path.join(realPath,"pym")
@ -166,7 +168,8 @@ subdirectories %s")%', '.join(dirsTemplates))
clVars.Set("cl_action", "merge" ,True)
# будут применены все шаблоны .clt (cltFilter=False)
# и обычные шаблоны
clTempl = template(clVars, cltFilter=False)
clTempl = template(clVars, cltFilter=False,
printWarning=False)
error = None
try:
if location=="clt":
@ -207,4 +210,8 @@ subdirectories %s")%', '.join(dirsTemplates))
if nameFile[:1] != "/":
nameFile = "/" + nameFile
self.printWARNING(" "*5 + nameFile)
if clTempl and clTempl.getWarning():
cl_overriding.printSUCCESS("")
for warn in clTempl.getWarning().split("\n"):
self.printWARNING(warn)
return True

Loading…
Cancel
Save