admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

uninstall: style fixes

Browse Source
This commit is contained in:
Alyssa Ross 2016-09-29 11:24:16 +01:00
parent 7792acda52
commit ed0fffd931
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Library/Homebrew/cmd/uninstall.rb
View File

@ -15,18 +15,18 @@ module Homebrew
raise KegUnspecifiedError if ARGV.named.empty? raise KegUnspecifiedError if ARGV.named.empty?
kegs_by_rack = if ARGV.force? kegs_by_rack = if ARGV.force?
Hash[ARGV.named.map do |name| Hash[ARGV.named.map { |name|
rack = Formulary.to_rack(name) rack = Formulary.to_rack(name)
[rack, rack.subdirs.map { |d| Keg.new(d) }] [rack, rack.subdirs.map { |d| Keg.new(d) }]
end] }]
else else
ARGV.kegs.group_by(&:rack) ARGV.kegs.group_by(&:rack)
end end
# --ignore-dependencies, to be consistent with install # --ignore-dependencies, to be consistent with install
unless ARGV.include?("--ignore-dependencies") || ARGV.homebrew_developer? unless ARGV.include?("--ignore-dependencies") || ARGV.homebrew_developer?
kegs = kegs_by_rack.values.flatten(1) all_kegs = kegs_by_rack.values.flatten(1)
return if check_for_dependents kegs return if check_for_dependents all_kegs
end end
kegs_by_rack.each do |rack, kegs| kegs_by_rack.each do |rack, kegs|
@ -77,14 +77,14 @@ module Homebrew
def check_for_dependents(kegs) def check_for_dependents(kegs)
kegs.each do |keg| kegs.each do |keg|
dependents = keg.installed_dependents - kegs dependents = keg.installed_dependents - kegs
if dependents.any? next if dependents.empty?
dependents_output = dependents.map { |k| "#{k.name} #{k.version}" }.join(", ") dependents_output = dependents.map { |k| "#{k.name} #{k.version}" }.join(", ")
conjugation = dependents.count == 1 ? "is" : "are" conjugation = dependents.count == 1 ? "is" : "are"
ofail "Refusing to uninstall #{keg} because it is required by #{dependents_output}, which #{conjugation} currently installed." 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}`." puts "You can override this and force removal with `brew uninstall --ignore-dependencies #{keg.name}`."
return true return true
end end
end
false false
end end