x/cloud-init
Code Issues Proposed changes

Add a check on 'chownbyname' that catches the keyerror and logs it (instead of failing)

Browse Source
This commit is contained in:
Joshua Harlow 2012-07-03 20:24:01 -07:00
parent d96be3c2af
commit 6f45663ca6
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
cloudinit/util.py
View File

@ -917,7 +917,8 @@ def pipe_in_out(in_fh, out_fh, chunk_size=1024, chunk_cb=None):
def chownbyid(fname, uid=None, gid=None): def chownbyid(fname, uid=None, gid=None):
if uid is None and gid is None: if uid in [None, -1] and gid in [None, -1]:
# Nothing to do
return return
LOG.debug("Changing the ownership of %s to %s:%s", fname, uid, gid) LOG.debug("Changing the ownership of %s to %s:%s", fname, uid, gid)
os.chown(fname, uid, gid) os.chown(fname, uid, gid)
@ -926,11 +927,17 @@ def chownbyid(fname, uid=None, gid=None):
def chownbyname(fname, user=None, group=None): def chownbyname(fname, user=None, group=None):
uid = -1 uid = -1
gid = -1 gid = -1
if user: try:
uid = pwd.getpwnam(user).pw_uid if user:
if group: uid = pwd.getpwnam(user).pw_uid
gid = grp.getgrnam(group).gr_gid if group:
gid = grp.getgrnam(group).gr_gid
except KeyError:
logexc(LOG, ("Failed changing the ownership of %s using username %s and"
" groupname %s (do they exist?)"), fname, user, group)
return False
chownbyid(fname, uid, gid) chownbyid(fname, uid, gid)
return True
# Always returns well formated values # Always returns well formated values