* Test whether core.log is available prior to using is (it is
currently only available if running within capisuite) * some minor code clean up in _setProtection() git-svn-id: https://svn.ibp.de/svn/capisuite/trunk/capisuite@421 4ebea2bb-67d4-0310-8558-a5799e421b66
This commit is contained in:
parent
18485a9269
commit
1c5da4b790
|
@ -47,6 +47,8 @@ def _getLock(lockname_=None, forfile=None, blocking=0):
|
||||||
raise LockTakenError
|
raise LockTakenError
|
||||||
else:
|
else:
|
||||||
raise
|
raise
|
||||||
|
# currently log is only available if running within capisuite
|
||||||
|
if hasattr(core, 'log'):
|
||||||
core.log("lock taken %s" % lockname_, 3)
|
core.log("lock taken %s" % lockname_, 3)
|
||||||
return (lockname_, lockfile)
|
return (lockname_, lockfile)
|
||||||
|
|
||||||
|
@ -61,6 +63,8 @@ def _releaseLock((lockname, lockfile)):
|
||||||
# in deleting than we; this doesn't harm, so ignore it
|
# in deleting than we; this doesn't harm, so ignore it
|
||||||
if (err.errno!=2):
|
if (err.errno!=2):
|
||||||
raise
|
raise
|
||||||
|
# currently log is only available if running within capisuite
|
||||||
|
if hasattr(core, 'log'):
|
||||||
core.log("lock released %s" % lockname, 3)
|
core.log("lock released %s" % lockname, 3)
|
||||||
|
|
||||||
|
|
||||||
|
@ -70,16 +74,13 @@ def _setProtection(user, mode=0600, *files):
|
||||||
userdata = pwd.getpwnam(user)
|
userdata = pwd.getpwnam(user)
|
||||||
except KeyError:
|
except KeyError:
|
||||||
raise UnknownUserError(user)
|
raise UnknownUserError(user)
|
||||||
print files
|
uid = os.getuid()
|
||||||
if os.getuid() == 0:
|
if uid == 0:
|
||||||
# running as root, change ownership
|
# running as root, change ownership
|
||||||
|
uid = userdata.pw_uid
|
||||||
for f in files:
|
for f in files:
|
||||||
os.chmod(f, mode)
|
os.chmod(f, mode)
|
||||||
os.chown(f, userdata.pw_uid, userdata.pw_gid)
|
os.chown(f, uid, userdata.pw_gid)
|
||||||
else:
|
|
||||||
for f in files:
|
|
||||||
os.chmod(f, mode)
|
|
||||||
os.chown(f, os.getuid(), userdata.pw_gid)
|
|
||||||
|
|
||||||
|
|
||||||
def _mkuserdir(user, parrentdir, *dirs):
|
def _mkuserdir(user, parrentdir, *dirs):
|
||||||
|
|
Loading…
Reference in New Issue