From 3c00fe9f419cef63520f16b051950a5693d74d6e Mon Sep 17 00:00:00 2001 From: usa Date: Thu, 24 Apr 2014 14:19:21 +0000 Subject: * lib/fileutils.rb (fu_get_uid, fu_get_gid): Etc.getpwnam/getgrnam may returns nil. * lib/webrick/utils.rb (su): ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@45712 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- lib/fileutils.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib/fileutils.rb') diff --git a/lib/fileutils.rb b/lib/fileutils.rb index 1b7bb11b18..0dfbf41d6c 100644 --- a/lib/fileutils.rb +++ b/lib/fileutils.rb @@ -1106,7 +1106,7 @@ module FileUtils when /\A\d+\z/ user.to_i else - Etc.getpwnam(user).uid + Etc.getpwnam(user) ? Etc.getpwnam(user).uid : nil end end private_module_function :fu_get_uid @@ -1119,7 +1119,7 @@ module FileUtils when /\A\d+\z/ group.to_i else - Etc.getgrnam(group).gid + Etc.getgrnam(group) ? Etc.getgrnam(group).gid : nil end end private_module_function :fu_get_gid -- cgit v1.2.3