develop
Самоукин Алексей 14 years ago
parent d43bc75223
commit 26ed3c3cbb

@ -3294,15 +3294,16 @@ re.M|re.S)
scanObj.processingFile = lambda x,y: createDictTemplates(x, y,\
self.dictTemplates)
# Считаем количество шаблонов
for dirTemplate in dirsTemplates:
if not os.path.exists(dirTemplate):
self.setError(_("No such template directory") +\
": %s" %dirTemplate)
return (self.createdDirs, self.filesApply)
dirsTemplatesExists = filter(lambda x: os.path.exists(x), dirsTemplates)
if not dirsTemplatesExists:
self.setError(_("No such template directories") +\
": %s"%", ".join(map(lambda x: "'%s'"%x ,dirsTemplates)))
return (self.createdDirs, self.filesApply)
for dirTemplate in dirsTemplatesExists:
scanObj.scanningDirectory(dirTemplate)
self.numberAllTemplates(self.allTemplates)
# Обрабатываем шаблоны
for dirTemplate in dirsTemplates:
for dirTemplate in dirsTemplatesExists:
if self.scanningTemplates(dirTemplate) is False:
return False
return (self.createdDirs, self.filesApply)

Loading…
Cancel
Save