Fix dead code in files module (#43479)

* Use pwd.getpwnam instead of non-existent pwd.getpwname

* Add specific exceptions to pwd and grp calls
This commit is contained in:
joren485 2018-09-04 16:06:57 +02:00 committed by Matt Martz
commit cd5d484f7a
2 changed files with 11 additions and 11 deletions

View file

@ -496,13 +496,13 @@ def main():
try: # user data
pw = pwd.getpwuid(st.st_uid)
output['pw_name'] = pw.pw_name
except:
except (TypeError, KeyError):
pass
try: # group data
grp_info = grp.getgrgid(st.st_gid)
output['gr_name'] = grp_info.gr_name
except:
except (KeyError, ValueError, OverflowError):
pass
# checksums