Skip to content
Snippets Groups Projects
Unverified Commit 72a346e6 authored by Cheng XU's avatar Cheng XU
Browse files

cask/installer: do not install tap during conflict checking

If the tap of the conflicted cask is not installed, we should just skip it.
This matches the behavior of formula installation.

Without this, running `brew install dropbox` would result to install
the `homebrew/cask-versions` tap.

Fixes #9125.
parent 53ef74f6
No related branches found
No related tags found
No related merge requests found
......@@ -120,6 +120,11 @@ module Cask
return unless @cask.conflicts_with
@cask.conflicts_with[:cask].each do |conflicting_cask|
if (match = conflicting_cask.match(HOMEBREW_TAP_CASK_REGEX))
conflicting_cask_tap = Tap.fetch(match[1], match[2])
next unless conflicting_cask_tap.installed?
end
conflicting_cask = CaskLoader.load(conflicting_cask)
raise CaskConflictError.new(@cask, conflicting_cask) if conflicting_cask.installed?
rescue CaskUnavailableError
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment