lib/chef/scan_access_control.rb in chef-10.14.0.rc.0 vs lib/chef/scan_access_control.rb in chef-10.14.0.rc.1
- old
+ new
@@ -74,11 +74,15 @@
raise ArgumentError, "cannot resolve #{new_resource.owner.inspect} to uid, owner must be a string or integer"
end
end
def lookup_uid
- Etc.getpwuid(stat.uid).name
+ unless (pwent = Etc.getpwuid(stat.uid)).nil?
+ pwent.name
+ else
+ stat.uid
+ end
rescue ArgumentError
stat.uid
end
# Set the group attribute of +current_resource+ to whatever the current state is.
@@ -97,10 +101,14 @@
raise ArgumentError, "cannot resolve #{new_resource.group.inspect} to gid, group must be a string or integer"
end
end
def lookup_gid
- Etc.getgrgid(stat.gid).name
+ unless (pwent = Etc.getgrgid(stat.gid)).nil?
+ pwent.name
+ else
+ stat.gid
+ end
rescue ArgumentError
stat.gid
end
def set_mode