|
|
|
@ -5333,12 +5333,12 @@ gettext -d cl_template "$*"
|
|
|
|
|
self.changedFiles.addObj(applyDir, ChangedFiles.DIR_EXISTS,
|
|
|
|
|
self.functObj.currentBelong,
|
|
|
|
|
self.functObj.currentBelongSlot)
|
|
|
|
|
NewUid, NewGid = os.getuid(), os.getgid()
|
|
|
|
|
tUid, tGid = getModeFile(applyDir, mode="owner")
|
|
|
|
|
if (NewUid, NewGid) != (tUid, tGid):
|
|
|
|
|
if not self.chownConfDir(applyDir, NewUid, NewGid,
|
|
|
|
|
templateDirFile):
|
|
|
|
|
if (self.uid, self.gid) != (tUid, tGid):
|
|
|
|
|
if not self.chownConfDir(applyDir, self.uid, self.gid,
|
|
|
|
|
templateDirFile):
|
|
|
|
|
return "", False, []
|
|
|
|
|
|
|
|
|
|
else:
|
|
|
|
|
self.changedFiles.addObj(applyDir, ChangedFiles.DIR_CREATED,
|
|
|
|
|
self.functObj.currentBelong,
|
|
|
|
@ -5897,12 +5897,11 @@ gettext -d cl_template "$*"
|
|
|
|
|
# Устанавливаем владельцем конфигурационного файла,
|
|
|
|
|
# пользователя по умолчанию (переменная шаблона ur_login)
|
|
|
|
|
if os.path.exists(pathOldFile):
|
|
|
|
|
NewUid, NewGid = os.getuid(), os.getgid()
|
|
|
|
|
tUid, tGid = getModeFile(pathOldFile, mode="owner")
|
|
|
|
|
if (NewUid, NewGid) != (tUid, tGid):
|
|
|
|
|
if (self.uid, self.gid) != (tUid, tGid):
|
|
|
|
|
# Изменяем владельца файла
|
|
|
|
|
if not self.chownConfFile(
|
|
|
|
|
pathOldFile, NewUid, NewGid, nameFileTemplate,
|
|
|
|
|
pathOldFile, self.uid, self.gid, nameFileTemplate,
|
|
|
|
|
checkExists=False):
|
|
|
|
|
preReturn(pathProg)
|
|
|
|
|
return [], False
|
|
|
|
|