|
|
|
@ -4012,7 +4012,7 @@ class Template(_file, _terms, _warning, xmlShare, _shareTemplate):
|
|
|
|
|
self._baseDir = pathJoin(self.objVar.Get("cl_chroot_path"),
|
|
|
|
|
self.objVar.Get("cl_root_path"))
|
|
|
|
|
self._baseDir = os.path.normpath(self._baseDir)
|
|
|
|
|
self.base_uid, self.base_gid, self.homeDir = self.getDataUser()
|
|
|
|
|
self.baseUid, self.baseGid, self.homeDir = self.getDataUser()
|
|
|
|
|
self.deletedFiles = []
|
|
|
|
|
self.prevDir = None
|
|
|
|
|
self.knownDirs = {}
|
|
|
|
@ -4817,7 +4817,7 @@ gettext -d cl_template "$*"
|
|
|
|
|
|
|
|
|
|
def getDirOwner(self, dir_path, prefix):
|
|
|
|
|
counter = len(dir_path)
|
|
|
|
|
own = (self.base_uid, self.base_gid)
|
|
|
|
|
own = (self.baseUid, self.baseGid)
|
|
|
|
|
for dir, owner in self.knownDirs.items():
|
|
|
|
|
if dir == dir_path:
|
|
|
|
|
return owner
|
|
|
|
@ -5179,7 +5179,7 @@ gettext -d cl_template "$*"
|
|
|
|
|
if realPath in self.dirsFilter:
|
|
|
|
|
return "", False, []
|
|
|
|
|
# Создаем директорию если необходимо
|
|
|
|
|
crDirs = self.createDir(applyDir, False, self.base_uid, self.base_gid)
|
|
|
|
|
crDirs = self.createDir(applyDir, False, self.baseUid, self.baseGid)
|
|
|
|
|
if not crDirs:
|
|
|
|
|
return "", False, []
|
|
|
|
|
if HParams.OptDir.Autoupdate in optDir:
|
|
|
|
@ -5328,7 +5328,7 @@ gettext -d cl_template "$*"
|
|
|
|
|
mode = self.__octToInt(objHead.params[HParams.ChangeMode])
|
|
|
|
|
if mode:
|
|
|
|
|
if not os.path.exists(applyDir):
|
|
|
|
|
crDirs = self.createDir(applyDir, mode, self.base_uid, self.base_gid)
|
|
|
|
|
crDirs = self.createDir(applyDir, mode, self.baseUid, self.baseGid)
|
|
|
|
|
if not crDirs:
|
|
|
|
|
return "", False, []
|
|
|
|
|
if not crDirs is True:
|
|
|
|
@ -5408,15 +5408,15 @@ gettext -d cl_template "$*"
|
|
|
|
|
self.functObj.currentBelong,
|
|
|
|
|
self.functObj.currentBelongSlot)
|
|
|
|
|
tUid, tGid = getModeFile(applyDir, mode="owner")
|
|
|
|
|
if (self.base_uid, self.base_gid) != (tUid, tGid):
|
|
|
|
|
if not self.chownConfDir(applyDir, self.base_uid, self.base_gid,
|
|
|
|
|
if (self.baseUid, self.baseGid) != (tUid, tGid):
|
|
|
|
|
if not self.chownConfDir(applyDir, self.baseUid, self.baseGid,
|
|
|
|
|
templateDirFile):
|
|
|
|
|
return "", False, []
|
|
|
|
|
else:
|
|
|
|
|
self.changedFiles.addObj(applyDir, ChangedFiles.DIR_CREATED,
|
|
|
|
|
self.functObj.currentBelong,
|
|
|
|
|
self.functObj.currentBelongSlot)
|
|
|
|
|
crDirs = self.createDir(applyDir, False, self.base_uid, self.base_gid)
|
|
|
|
|
crDirs = self.createDir(applyDir, False, self.baseUid, self.baseGid)
|
|
|
|
|
if not crDirs:
|
|
|
|
|
return "", False, []
|
|
|
|
|
if crDirs is not True:
|
|
|
|
|