Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions lib/fileutils.rb
Original file line number Diff line number Diff line change
Expand Up @@ -1081,11 +1081,6 @@ def chown_R(user, group, list, noop: nil, verbose: nil, force: nil)
end
module_function :chown_R

begin
require 'etc'
rescue LoadError # rescue LoadError for miniruby
end

def fu_get_uid(user) #:nodoc:
return nil unless user
case user
Expand All @@ -1094,6 +1089,7 @@ def fu_get_uid(user) #:nodoc:
when /\A\d+\z/
user.to_i
else
require 'etc'
Etc.getpwnam(user) ? Etc.getpwnam(user).uid : nil
end
end
Expand All @@ -1107,6 +1103,7 @@ def fu_get_gid(group) #:nodoc:
when /\A\d+\z/
group.to_i
else
require 'etc'
Etc.getgrnam(group) ? Etc.getgrnam(group).gid : nil
end
end
Expand Down