From 3b1fc3033d03a2e9278bc7888327886ed5e97232 Mon Sep 17 00:00:00 2001 From: Narayan Desai Date: Thu, 14 Jun 2007 22:45:20 +0000 Subject: update from mbrady to fix nonexistent group problem git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@3311 ce84e21b-d406-0410-9b95-82705330c041 --- src/lib/Client/Tools/rpmtools.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/lib/Client/Tools/rpmtools.py b/src/lib/Client/Tools/rpmtools.py index 06c15a2d1..5df6d89a7 100755 --- a/src/lib/Client/Tools/rpmtools.py +++ b/src/lib/Client/Tools/rpmtools.py @@ -511,12 +511,18 @@ def rpm_verify_file(fileinfo, rpmlinktos, omitmask): file_results.append('RPMVERIFY_MTIME') if flags & RPMVERIFY_USER: - user = pwd.getpwuid(lstat.st_uid)[0] + try: + user = pwd.getpwuid(lstat.st_uid)[0] + except KeyError: + user = None if not user or not fuser or (user != fuser): file_results.append('RPMVERIFY_USER') if flags & RPMVERIFY_GROUP: - group = grp.getgrgid(lstat.st_gid)[0] + try: + group = grp.getgrgid(lstat.st_gid)[0] + except KeyError: + group = None if not group or not fgroup or (group != fgroup): file_results.append('RPMVERIFY_GROUP') -- cgit v1.2.3-1-g7c22