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

test-bot: unlink conflict formulae during the test

Browse Source 
Closes Homebrew/homebrew#35697.

Signed-off-by: Mike McQuaid <mike@mikemcquaid.com>
This commit is contained in:
Xu Cheng 2015-01-09 22:33:57 +08:00 committed by Mike McQuaid
parent ae0a7bcad4
commit 1818799634
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Library/Homebrew/cmd/test-bot.rb
View File

@ -447,6 +447,10 @@ module Homebrew
unless dependent.installed? unless dependent.installed?
test "brew", "fetch", "--retry", dependent.name test "brew", "fetch", "--retry", dependent.name
next if steps.last.failed? 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 test "brew", "install", dependent.name
next if steps.last.failed? next if steps.last.failed?
end end