diff options
author | David RodrÃguez <deivid.rodriguez@riseup.net> | 2019-04-26 13:26:21 +0200 |
---|---|---|
committer | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2019-04-28 11:07:45 +0900 |
commit | d0a54673202458455244f79ed212a97727f0c7c7 (patch) | |
tree | 4d984b9e2675d906b3e336c7f951f03b11316546 /lib/rubygems/installer.rb | |
parent | a15f7dd1fb1148c3d586238ee6907875f2e40379 (diff) | |
download | ruby-d0a54673202458455244f79ed212a97727f0c7c7.tar.gz |
Update rubygems with latest upstream changes
Closes: https://github.com/ruby/ruby/pull/2154
Diffstat (limited to 'lib/rubygems/installer.rb')
-rw-r--r-- | lib/rubygems/installer.rb | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/rubygems/installer.rb b/lib/rubygems/installer.rb index 8b80125922..76c3bcf1d7 100644 --- a/lib/rubygems/installer.rb +++ b/lib/rubygems/installer.rb @@ -193,7 +193,7 @@ class Gem::Installer @bin_dir = options[:bin_dir] if options[:bin_dir] - if options[:user_install] and not options[:unpack] + if options[:user_install] @gem_home = Gem.user_dir @bin_dir = Gem.bindir gem_home unless options[:bin_dir] check_that_user_bin_dir_is_in_path @@ -428,6 +428,7 @@ class Gem::Installer @gem_dir = directory extract_files end + deprecate :unpack, :none, 2020, 04 ## # The location of the spec file that is installed. @@ -726,10 +727,9 @@ class Gem::Installer end end - def verify_gem_home(unpack = false) # :nodoc: + def verify_gem_home # :nodoc: FileUtils.mkdir_p gem_home, :mode => options[:dir_mode] && 0755 - raise Gem::FilePermissionError, gem_home unless - unpack or File.writable?(gem_home) + raise Gem::FilePermissionError, gem_home unless File.writable?(gem_home) end def verify_spec @@ -898,7 +898,7 @@ TEXT # The dependent check will be skipped if the install is ignoring dependencies. def pre_install_checks - verify_gem_home options[:unpack] + verify_gem_home # The name and require_paths must be verified first, since it could contain # ruby code that would be eval'ed in #ensure_loadable_spec |