Merge pull request #517 from goozbach/devel

Updated the file module to handle the case where the UID for the file doesn't exist on the system.
This commit is contained in:
Michael DeHaan 2012-07-02 05:18:29 -07:00
commit 9fe39be90d

View file

@ -184,8 +184,14 @@ def user_and_group(filename):
st = os.stat(filename) st = os.stat(filename)
uid = st.st_uid uid = st.st_uid
gid = st.st_gid gid = st.st_gid
user = pwd.getpwuid(uid)[0] try:
group = grp.getgrgid(gid)[0] user = pwd.getpwuid(uid)[0]
except KeyError:
user = str(uid)
try:
group = grp.getgrgid(gid)[0]
except KeyError:
group = str(gid)
return (user, group) return (user, group)
def set_context_if_different(path, context, changed): def set_context_if_different(path, context, changed):