Bugfix cl_name in root templates.

develop
Самоукин Алексей 13 years ago
parent 7391f33c87
commit c7affe7e3c

@ -3804,22 +3804,26 @@ re.M|re.S)
else: else:
flagDir = False flagDir = False
templatePath = dirFile templatePath = dirFile
if os.path.isfile(templatePath) and\ if os.path.isfile(templatePath):
self.getFileType(templatePath) != "bin": if self.getFileType(templatePath) == "bin":
textTemplate = open(templatePath).read() skipTemplates.append(dirFile)
if textTemplate: else:
headerLine = self.getHeaderText(textTemplate) textTemplate = open(templatePath).read()
if headerLine: if textTemplate:
if not "cl_name==" in headerLine: headerLine = self.getHeaderText(textTemplate)
if headerLine:
if not "cl_name==" in headerLine:
if flagDir:
skipDirs.append(dirFile)
else:
skipTemplates.append(dirFile)
else:
if flagDir: if flagDir:
skipDirs.append(dirFile) skipDirs.append(dirFile)
else: else:
skipTemplates.append(dirFile) skipTemplates.append(dirFile)
else: else:
if flagDir: skipTemplates.append(dirFile)
skipDirs.append(dirFile)
else:
skipTemplates.append(dirFile)
if skipDirs or skipTemplates: if skipDirs or skipTemplates:
# print warning # print warning
from cl_print import color_print from cl_print import color_print

Loading…
Cancel
Save