style: Fix style issues
This commit is contained in:
parent
8a05b5258a
commit
dff61c9eab
@ -266,10 +266,10 @@ module Homebrew
|
|||||||
Keg.new(dirs.first)
|
Keg.new(dirs.first)
|
||||||
else
|
else
|
||||||
f = if name.include?("/") || File.exist?(name)
|
f = if name.include?("/") || File.exist?(name)
|
||||||
Formulary.factory(name)
|
Formulary.factory(name)
|
||||||
else
|
else
|
||||||
Formulary.from_rack(rack)
|
Formulary.from_rack(rack)
|
||||||
end
|
end
|
||||||
|
|
||||||
unless (prefix = f.installed_prefix).directory?
|
unless (prefix = f.installed_prefix).directory?
|
||||||
raise MultipleVersionsInstalledError, rack.basename
|
raise MultipleVersionsInstalledError, rack.basename
|
||||||
|
|||||||
@ -69,11 +69,11 @@ module Homebrew
|
|||||||
end
|
end
|
||||||
Homebrew.messages.display_messages
|
Homebrew.messages.display_messages
|
||||||
|
|
||||||
unless casks.empty?
|
return if casks.empty?
|
||||||
reinstall_cmd = Cask::Cmd::Reinstall.new(casks)
|
|
||||||
reinstall_cmd.verbose = args.verbose?
|
reinstall_cmd = Cask::Cmd::Reinstall.new(casks)
|
||||||
reinstall_cmd.force = args.force?
|
reinstall_cmd.verbose = args.verbose?
|
||||||
reinstall_cmd.run
|
reinstall_cmd.force = args.force?
|
||||||
end
|
reinstall_cmd.run
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@ -49,8 +49,8 @@ module Homebrew
|
|||||||
[rack, rack.subdirs.map { |d| Keg.new(d) }]
|
[rack, rack.subdirs.map { |d| Keg.new(d) }]
|
||||||
end]
|
end]
|
||||||
else
|
else
|
||||||
_kegs, casks = args.kegs_casks
|
all_kegs, casks = args.kegs_casks
|
||||||
kegs_by_rack = _kegs.group_by(&:rack)
|
kegs_by_rack = all_kegs.group_by(&:rack)
|
||||||
end
|
end
|
||||||
|
|
||||||
handle_unsatisfied_dependents(kegs_by_rack)
|
handle_unsatisfied_dependents(kegs_by_rack)
|
||||||
@ -128,7 +128,6 @@ module Homebrew
|
|||||||
cask_uninstall.verbose = args.verbose?
|
cask_uninstall.verbose = args.verbose?
|
||||||
cask_uninstall.run
|
cask_uninstall.run
|
||||||
end
|
end
|
||||||
|
|
||||||
rescue MultipleVersionsInstalledError => e
|
rescue MultipleVersionsInstalledError => e
|
||||||
ofail e
|
ofail e
|
||||||
puts "Run `brew uninstall --force #{e.name}` to remove all versions."
|
puts "Run `brew uninstall --force #{e.name}` to remove all versions."
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user