|
|
|
@ -3837,10 +3837,14 @@ should include a check of the variable 'cl-name'."))
|
|
|
|
|
if optDir.get("path"):
|
|
|
|
|
path = optDir["path"]
|
|
|
|
|
else:
|
|
|
|
|
path = os.path.split(applyDir)[1]
|
|
|
|
|
path = pathJoin(self._baseDir, path)
|
|
|
|
|
if applyDir == self._baseDir:
|
|
|
|
|
path = os.path.dirname(self._baseDir)
|
|
|
|
|
else:
|
|
|
|
|
path = os.path.split(applyDir)[1]
|
|
|
|
|
path = pathJoin(self._baseDir, path)
|
|
|
|
|
if not os.path.exists(templateDirFile):
|
|
|
|
|
applyDir = os.path.join(path, os.path.split(applyDir)[1])
|
|
|
|
|
if applyDir != self._baseDir:
|
|
|
|
|
applyDir = os.path.join(path, os.path.split(applyDir)[1])
|
|
|
|
|
# Фильтрация шаблонов по названию директории
|
|
|
|
|
realPath = os.path.join("/",applyDir.partition(self._baseDir)[2])
|
|
|
|
|
if realPath in self.dirsFilter:
|
|
|
|
|