archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-15 08:33:58 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Merge rubygems/bundler HEAD.

Browse source 
Pick from dfbb5a3811
This commit is contained in:
Hiroshi SHIBATA 2022-08-09 11:16:07 +09:00
parent f8936b3341
commit 44264b4fee
Notes: git 2022-08-09 12:05:48 +09:00
80 changed files with 312 additions and 286 deletions
Download patch file Download diff file Expand all files Collapse all files

8
lib/rubygems/uninstaller.rb
View file

@ -105,8 +105,8 @@ class Gem::Uninstaller
@default_specs_matching_uninstall_params = default_specs
list, other_repo_specs = list.partition do |spec|
@gem_home == spec.base_dir or
(@user_install and spec.base_dir == Gem.user_dir)
@gem_home == spec.base_dir ||
(@user_install && spec.base_dir == Gem.user_dir)
end
list.sort!
@ -239,8 +239,8 @@ class Gem::Uninstaller
# spec:: the spec of the gem to be uninstalled
def remove(spec)
unless path_ok?(@gem_home, spec) or
(@user_install and path_ok?(Gem.user_dir, spec))
unless path_ok?(@gem_home, spec) ||
(@user_install && path_ok?(Gem.user_dir, spec))
e = Gem::GemNotInHomeException.new \
"Gem '#{spec.full_name}' is not installed in directory #{@gem_home}"
e.spec = spec