diff options
| author | Xu Cheng | 2015-01-09 22:33:57 +0800 |
|---|---|---|
| committer | Mike McQuaid | 2015-01-09 15:37:29 +0000 |
| commit | 1818799634c433c476b07262bfc8a246863b0445 (patch) | |
| tree | d666f64841dd48cbf46ca45add5a9d6711b4bc38 /Library/Homebrew | |
| parent | ae0a7bcad40b83763e2c7cbbe67da97c972ade6c (diff) | |
| download | brew-1818799634c433c476b07262bfc8a246863b0445.tar.bz2 | |
test-bot: unlink conflict formulae during the test
Closes Homebrew/homebrew#35697.
Signed-off-by: Mike McQuaid <mike@mikemcquaid.com>
Diffstat (limited to 'Library/Homebrew')
| -rw-r--r-- | Library/Homebrew/cmd/test-bot.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Library/Homebrew/cmd/test-bot.rb b/Library/Homebrew/cmd/test-bot.rb index 8d49f7df8..ce704100e 100644 --- a/Library/Homebrew/cmd/test-bot.rb +++ b/Library/Homebrew/cmd/test-bot.rb @@ -447,6 +447,10 @@ module Homebrew unless dependent.installed? test "brew", "fetch", "--retry", dependent.name next if steps.last.failed? + conflicts = dependent.conflicts.map { |c| Formulary.factory(c.name) }.select { |f| f.installed? } + conflicts.each do |conflict| + test "brew", "unlink", conflict.name + end test "brew", "install", dependent.name next if steps.last.failed? end |