|
|
|
@ -3551,11 +3551,15 @@ re.M|re.S)
|
|
|
|
|
# autoupdate файлы
|
|
|
|
|
self.autoUpdateFiles = []
|
|
|
|
|
self.autoUpdateDirs = []
|
|
|
|
|
# список выполненных файлов
|
|
|
|
|
self.executedFiles = []
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def executeTemplate(self, path, execPath):
|
|
|
|
|
"""Execute template"""
|
|
|
|
|
if os.system("""%s %s %s"""%(execPath,path,'>/dev/null 2>&1')) == 0:
|
|
|
|
|
if os.system("""{interpreter} {cmdfile}""".format(
|
|
|
|
|
interpreter=execPath, cmdfile=path)) == 0:
|
|
|
|
|
self.executedFiles.append((path,execPath))
|
|
|
|
|
return True
|
|
|
|
|
else:
|
|
|
|
|
return False
|
|
|
|
@ -4858,6 +4862,7 @@ variable 'cl_name'"))
|
|
|
|
|
self.setError(_("Can not execute") + ": " +\
|
|
|
|
|
self.nameFileConfig)
|
|
|
|
|
return False
|
|
|
|
|
return False
|
|
|
|
|
return filesApply
|
|
|
|
|
# Создаем объект в случае параметра format в заголовке
|
|
|
|
|
if (typeAppendTemplate == "replace" or\
|
|
|
|
@ -4929,6 +4934,7 @@ variable 'cl_name'"))
|
|
|
|
|
self.setError(_("Can not execute") + ": " +\
|
|
|
|
|
self.nameFileConfig)
|
|
|
|
|
return False
|
|
|
|
|
return False
|
|
|
|
|
return filesApply
|
|
|
|
|
# Вверху
|
|
|
|
|
elif typeAppendTemplate == "before":
|
|
|
|
@ -4957,6 +4963,7 @@ variable 'cl_name'"))
|
|
|
|
|
self.setError(_("Can not execute") + ": " +\
|
|
|
|
|
self.nameFileConfig)
|
|
|
|
|
return False
|
|
|
|
|
return False
|
|
|
|
|
return filesApply
|
|
|
|
|
# Внизу
|
|
|
|
|
elif typeAppendTemplate == "after":
|
|
|
|
@ -4984,6 +4991,7 @@ variable 'cl_name'"))
|
|
|
|
|
self.setError(_("Can not execute") + ": " +\
|
|
|
|
|
self.nameFileConfig)
|
|
|
|
|
return False
|
|
|
|
|
return False
|
|
|
|
|
return filesApply
|
|
|
|
|
# Объединение
|
|
|
|
|
elif typeAppendTemplate == "join":
|
|
|
|
@ -5075,6 +5083,7 @@ variable 'cl_name'"))
|
|
|
|
|
self.setError(_("Can not execute") + ": " +\
|
|
|
|
|
self.nameFileConfig)
|
|
|
|
|
return False
|
|
|
|
|
return False
|
|
|
|
|
return filesApply
|
|
|
|
|
else:
|
|
|
|
|
self.setError(_("False (type append) template") + ": " +\
|
|
|
|
|