aboutsummaryrefslogtreecommitdiffstats
path: root/Library
diff options
context:
space:
mode:
authorAlyssa Ross2016-09-29 11:24:16 +0100
committerAlyssa Ross2016-10-25 22:34:35 +0100
commited0fffd93117a5d2d0297c5965d661e2e7e250de (patch)
treeeea4e237e25dbc770a0cb48a8dc87282bcb3a7e9 /Library
parent7792acda52c9c3b810959ac2c20066d3cf1fbe15 (diff)
downloadbrew-ed0fffd93117a5d2d0297c5965d661e2e7e250de.tar.bz2
uninstall: style fixes
Diffstat (limited to 'Library')
-rw-r--r--Library/Homebrew/cmd/uninstall.rb22
1 files changed, 11 insertions, 11 deletions
diff --git a/Library/Homebrew/cmd/uninstall.rb b/Library/Homebrew/cmd/uninstall.rb
index b9e50db23..e00109bac 100644
--- a/Library/Homebrew/cmd/uninstall.rb
+++ b/Library/Homebrew/cmd/uninstall.rb
@@ -15,18 +15,18 @@ module Homebrew
raise KegUnspecifiedError if ARGV.named.empty?
kegs_by_rack = if ARGV.force?
- Hash[ARGV.named.map do |name|
+ Hash[ARGV.named.map { |name|
rack = Formulary.to_rack(name)
[rack, rack.subdirs.map { |d| Keg.new(d) }]
- end]
+ }]
else
ARGV.kegs.group_by(&:rack)
end
# --ignore-dependencies, to be consistent with install
unless ARGV.include?("--ignore-dependencies") || ARGV.homebrew_developer?
- kegs = kegs_by_rack.values.flatten(1)
- return if check_for_dependents kegs
+ all_kegs = kegs_by_rack.values.flatten(1)
+ return if check_for_dependents all_kegs
end
kegs_by_rack.each do |rack, kegs|
@@ -77,13 +77,13 @@ module Homebrew
def check_for_dependents(kegs)
kegs.each do |keg|
dependents = keg.installed_dependents - kegs
- if dependents.any?
- dependents_output = dependents.map { |k| "#{k.name} #{k.version}" }.join(", ")
- conjugation = dependents.count == 1 ? "is" : "are"
- ofail "Refusing to uninstall #{keg} because it is required by #{dependents_output}, which #{conjugation} currently installed."
- puts "You can override this and force removal with `brew uninstall --ignore-dependencies #{keg.name}`."
- return true
- end
+ next if dependents.empty?
+
+ dependents_output = dependents.map { |k| "#{k.name} #{k.version}" }.join(", ")
+ conjugation = dependents.count == 1 ? "is" : "are"
+ ofail "Refusing to uninstall #{keg} because it is required by #{dependents_output}, which #{conjugation} currently installed."
+ puts "You can override this and force removal with `brew uninstall --ignore-dependencies #{keg.name}`."
+ return true
end
false
end