summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Rodríguez <deivid.rodriguez@riseup.net>2019-03-26 12:08:55 +0100
committerDavid Rodríguez <deivid.rodriguez@riseup.net>2019-03-26 12:28:48 +0100
commitf441248ef765f4b1da8f07a867c26f93785f2f60 (patch)
tree028f4b752eac89245e70c65c956eafcf25d8eebf
parent08e49c6875f5685d3dc9a0453ee5eb1a96a939e7 (diff)
downloadbundler-f441248ef765f4b1da8f07a867c26f93785f2f60.tar.gz
Patch vendored fileutils for now
-rw-r--r--lib/bundler/vendor/fileutils/lib/fileutils.rb7
1 files changed, 2 insertions, 5 deletions
diff --git a/lib/bundler/vendor/fileutils/lib/fileutils.rb b/lib/bundler/vendor/fileutils/lib/fileutils.rb
index 77b3bade52..3a48e80293 100644
--- a/lib/bundler/vendor/fileutils/lib/fileutils.rb
+++ b/lib/bundler/vendor/fileutils/lib/fileutils.rb
@@ -1082,11 +1082,6 @@ module Bundler::FileUtils
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
@@ -1095,6 +1090,7 @@ module Bundler::FileUtils
when /\A\d+\z/
user.to_i
else
+ require 'etc'
Etc.getpwnam(user) ? Etc.getpwnam(user).uid : nil
end
end
@@ -1108,6 +1104,7 @@ module Bundler::FileUtils
when /\A\d+\z/
group.to_i
else
+ require 'etc'
Etc.getgrnam(group) ? Etc.getgrnam(group).gid : nil
end
end