retronetworking
/
capisuite
13
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* 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:
htgoebel 2005-01-22 12:53:55 +00:00
parent 18485a9269
commit 1c5da4b790
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/capisuite-py/fileutils.py
View File

@ -47,7 +47,9 @@ def _getLock(lockname_=None, forfile=None, blocking=0):
raise LockTakenError
else:
raise
core.log("lock taken %s" % lockname_, 3)
# currently log is only available if running within capisuite
if hasattr(core, 'log'):
core.log("lock taken %s" % lockname_, 3)
return (lockname_, lockfile)
@ -61,7 +63,9 @@ def _releaseLock((lockname, lockfile)):
# in deleting than we; this doesn't harm, so ignore it
if (err.errno!=2):
raise
core.log("lock released %s" % lockname, 3)
# currently log is only available if running within capisuite
if hasattr(core, 'log'):
core.log("lock released %s" % lockname, 3)
def _setProtection(user, mode=0600, *files):
@ -70,16 +74,13 @@ def _setProtection(user, mode=0600, *files):
userdata = pwd.getpwnam(user)
except KeyError:
raise UnknownUserError(user)
print files
if os.getuid() == 0:
uid = os.getuid()
if uid == 0:
# running as root, change ownership
for f in files:
os.chmod(f, mode)
os.chown(f, userdata.pw_uid, userdata.pw_gid)
else:
for f in files:
os.chmod(f, mode)
os.chown(f, os.getuid(), userdata.pw_gid)
uid = userdata.pw_uid
for f in files:
os.chmod(f, mode)
os.chown(f, uid, userdata.pw_gid)
def _mkuserdir(user, parrentdir, *dirs):