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

Remove a conditional and always pass the spec to satisfied_requirements

Browse Source
This commit is contained in:
Jack Nagel 2014-07-19 22:18:06 -05:00
parent d706bcf153
commit a9c5e81a48
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Library/Contributions/cmd/brew-test-bot.rb
View File

@ -265,12 +265,8 @@ class Test
puts "#{Tty.blue}==>#{Tty.white} SKIPPING: #{formula}#{Tty.reset}" puts "#{Tty.blue}==>#{Tty.white} SKIPPING: #{formula}#{Tty.reset}"
end end
def satisfied_requirements? formula_object, spec=:stable def satisfied_requirements? formula_object, spec
requirements = if spec == :stable requirements = formula_object.send(spec).requirements
formula_object.recursive_requirements
else
formula_object.send(spec).requirements
end
unsatisfied_requirements = requirements.reject do |requirement| unsatisfied_requirements = requirements.reject do |requirement|
requirement.satisfied? || requirement.default_formula? requirement.satisfied? || requirement.default_formula?
@ -302,7 +298,7 @@ class Test
dependencies = `brew deps #{formula}`.split("\n") dependencies = `brew deps #{formula}`.split("\n")
dependencies -= `brew list`.split("\n") dependencies -= `brew list`.split("\n")
formula_object = Formulary.factory(formula) formula_object = Formulary.factory(formula)
return unless satisfied_requirements? formula_object return unless satisfied_requirements?(formula_object, :stable)
installed_gcc = false installed_gcc = false
begin begin