Исправлен параметр chown при выполнении шаблона директории

legacy27 3.6.7.2
Mike Hiretsky 4 years ago
parent 8f66c56eb3
commit 185134fe9d

@ -5157,28 +5157,37 @@ gettext -d cl_template "$*"
if owner:
if ":" in owner:
strUid, strGid = owner.split(":")
import pwd
if strUid.isdigit():
owner_uid = int(strUid)
else:
owner_uid = self.getUidFromPasswd(strUid)
import pwd
try:
owner_uid = pwd.getpwnam(strUid).pw_uid
except (KeyError, TypeError):
self.setError(_("No such user on the system: ")
+ strUid)
self.setError(
(_("Wrong value '%s' in the template")
% HParams.ChangeOwner) + _(": ") + templateDirFile)
return "", False, []
try:
try:
if owner_uid is None:
owner_uid = pwd.getpwnam(strUid).pw_uid
except (KeyError, TypeError):
self.setError(_("No such user on the system: ")
+ strUid)
self.setError(
(_("Wrong value '%s' in the template")
% HParams.ChangeOwner) + _(": ") + templateDirFile)
return "", False, []
if strGid.isdigit():
owner_gid = int(strGid)
else:
owner_gid = self.getGidFromGroup(strGid)
import grp
owner_gid = grp.getgrnam(strGid).gr_gid
except (KeyError, TypeError):
self.setError(_("Group not found on the system: ")
+ strGid)
self.setError(
(_("Wrong value '%s' in the template")
% HParams.ChangeOwner) + _(": ") + templateDirFile)
return "", False, []
try:
if owner_gid is None:
owner_gid = grp.getgrnam(strGid).gr_gid
except (KeyError, TypeError):
self.setError(_("Group not found on the system: ")
+ strGid)
self.setError(
(_("Wrong value '%s' in the template")
% HParams.ChangeOwner) + _(": ") + templateDirFile)
return "", False, []
if not os.path.exists(applyDir):
crDirs = self.createDir(applyDir, False, owner_uid,

Loading…
Cancel
Save