added relative paths to "link"

master 3.7.2.17
idziubenko 2 years ago
parent 90c6163570
commit 57d328aa01

@ -5348,8 +5348,9 @@ gettext -d cl_template "$*"
if crDirs is not True:
createdDirs += crDirs
if HParams.DirectoryLink in objHead.params:
templateFile = objHead.params[HParams.DirectoryLink]
templateFile = objHead.params[HParams.DirectoryLink]
templateFile = pathJoin(self._baseDir, templateFile)
#TODO relative path for dirs?
if not os.path.isdir(templateFile):
self.setError(_("Source path %s is not a directory")
% templateFile)
@ -5706,7 +5707,13 @@ gettext -d cl_template "$*"
# Получаем директорию пользователя
templateFile = os.path.join(
self.homeDir, templateFile.partition("/")[2], "")[:-1]
templateFile = pathJoin(self._baseDir, templateFile)
if templateFile and templateFile[0] == "/":
templateFile = pathJoin(self._baseDir, templateFile)
else:
#relative path
templateFile = pathJoin(os.path.dirname(pathOldFile), templateFile)
templateFile = pathJoin(self._baseDir, templateFile)
templateFile = os.path.abspath(templateFile)
if (not os.path.exists(templateFile) or
not objHeadNew.params[HParams.Link]):
if os.path.exists(pathOldFile):
@ -5730,7 +5737,14 @@ gettext -d cl_template "$*"
# Получаем директорию пользователя
templateFile = os.path.join(
self.homeDir, templateFile.partition("/")[2], "")[:-1]
templateFile = pathJoin(self._baseDir, templateFile)
if templateFile and templateFile[0] == "/":
templateFile = pathJoin(self._baseDir, templateFile)
else:
#relative path
templateFile = pathJoin(os.path.dirname(pathOldFile), templateFile)
templateFile = pathJoin(self._baseDir, templateFile)
templateFile = os.path.abspath(templateFile)
foundTemplateFile = os.path.exists(templateFile)
buff = None
buff_is_unicode = False

Loading…
Cancel
Save