From 492dc7478e0ab3eb03eb3b0b5d0e47812339b83f Mon Sep 17 00:00:00 2001 From: Joshua Harlow Date: Mon, 9 Jul 2012 15:08:27 -0400 Subject: Update chownbyname to catch the key error when users/groups that are not known are provided and rethrow it as a OSError (which seems reasonable) and adjust its usage in the log file touching/permission modification stage to catch this error and log it. --- cloudinit/util.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'cloudinit/util.py') diff --git a/cloudinit/util.py b/cloudinit/util.py index 44ce9770..e591e306 100644 --- a/cloudinit/util.py +++ b/cloudinit/util.py @@ -937,12 +937,9 @@ def chownbyname(fname, user=None, group=None): uid = pwd.getpwnam(user).pw_uid 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 + except KeyError as e: + raise OSError("Unknown user or group: %s" % (e)) chownbyid(fname, uid, gid) - return True # Always returns well formated values -- cgit v1.2.3