From d219be4a1c237356670ebafd415e983433362e72 Mon Sep 17 00:00:00 2001 From: David Rodríguez Date: Wed, 21 Aug 2019 20:05:24 +0200 Subject: [rubygems/rubygems] Move empty check earlier https://github.com/rubygems/rubygems/commit/fc224e9717 --- lib/rubygems/uninstaller.rb | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'lib/rubygems') diff --git a/lib/rubygems/uninstaller.rb b/lib/rubygems/uninstaller.rb index bbca22154e..46d92820cb 100644 --- a/lib/rubygems/uninstaller.rb +++ b/lib/rubygems/uninstaller.rb @@ -88,6 +88,10 @@ class Gem::Uninstaller list << spec end + if list.empty? + raise Gem::InstallError, "gem #{@gem.inspect} is not installed" + end + default_specs, list = list.partition do |spec| spec.default_gem? end @@ -101,9 +105,7 @@ class Gem::Uninstaller if list.empty? if other_repo_specs.empty? - if default_specs.empty? - raise Gem::InstallError, "gem #{@gem.inspect} is not installed" - else + if default_specs.any? message = "gem #{@gem.inspect} cannot be uninstalled " + "because it is a default gem" -- cgit v1.2.3